Merge branch 'stable'

author: Lars Hjemli <hjemli@gmail.com> 2009-11-07 14:35:36 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2009-11-07 14:35:36 (UTC)
commit: 4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) (unidiff)
tree: 593616b5bd2e8c662d00478f50ecee86a0002224
parent: 13032727ffa81a4de8964d4002c359c0983cdeb2 (diff)
parent: 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff)
download: cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip
cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz
cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.bz2
2 files changed, 8 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index d7b2d5a..a27ab30 100644
--- a/shared.c
+++ b/shared.c
@@ -361,57 +361,62 @@ int cgit_parse_snapshots_mask(const char *str)
 }
 int cgit_open_filter(struct cgit_filter *filter)
 {
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
        chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
        if (filter->pid == 0) {
                close(filter->pipe_fh[1]);
                chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
                        "Unable to use pipe as STDIN");
                execvp(filter->cmd, filter->argv);
                die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
                        strerror(errno), errno);
        }
        close(filter->pipe_fh[0]);
        chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
                "Unable to use pipe as STDOUT");
        close(filter->pipe_fh[1]);
        return 0;
 }
 int cgit_close_filter(struct cgit_filter *filter)
 {
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");
        close(filter->old_stdout);
        if (filter->pid < 0)
                return 0;
        waitpid(filter->pid, &filter->exitstatus, 0);
        if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
                return 0;
        die("Subprocess %s exited abnormally", filter->cmd);
 }
 /* Read the content of the specified file into a newly allocated buffer,
 * zeroterminate the buffer and return 0 on success, errno otherwise.
 */
 int readfile(const char *path, char **buf, size_t *size)
 {
        int fd;
        struct stat st;
        fd = open(path, O_RDONLY);
        if (fd == -1)
                return errno;
-        if (fstat(fd, &st))
+        if (fstat(fd, &st)) {
+                close(fd);
                return errno;
-        if (!S_ISREG(st.st_mode))
+        }
+        if (!S_ISREG(st.st_mode)) {
+                close(fd);
                return EISDIR;
+        }
        *buf = xmalloc(st.st_size + 1);
        *size = read_in_full(fd, *buf, st.st_size);
        (*buf)[*size] = '\0';
+        close(fd);
        return (*size == st.st_size ? 0 : errno);
 }
diff --git a/ui-shared.c b/ui-shared.c
index 6cb7edb..3a9e67b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,71 +1,71 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "cmd.h"
 #include "html.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
+                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 char *cgit_httpscheme()
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";
        else
                return "http://";
 }
 char *cgit_hosturl()
 {
        if (ctx.env.http_host)
                return ctx.env.http_host;
        if (!ctx.env.server_name)
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
                return ctx.env.server_name;
        return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
 }
 char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
                return fmt("%s/", ctx.cfg.virtual_root);
        else
                return ctx.cfg.script_name;
 }
 char *cgit_repourl(const char *reponame)
 {
        if (ctx.cfg.virtual_root) {
                return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
 }
author	Lars Hjemli <hjemli@gmail.com>	2009-11-07 14:35:36 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2009-11-07 14:35:36 (UTC)
commit	4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) (unidiff)
tree	593616b5bd2e8c662d00478f50ecee86a0002224
parent	13032727ffa81a4de8964d4002c359c0983cdeb2 (diff)
parent	8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff)
download	cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.bz2