Optionally generate verbose parent links

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index a764c4d6b25bbde782cafe159c0bef05ccc98f21..83ded44de93b4343364ddfacedc94e9672008a02 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -48,19 +48,26 @@ struct cgit_repo *cgit_add_repo(const char *url)
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];

+       memset(ret, 0, sizeof(struct cgit_repo));

        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = "[no description]";
        ret->owner = NULL;
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = "[no description]";
        ret->owner = NULL;

-       ret->group = ctx.cfg.repo_group;
+       ret->section = ctx.cfg.section;

        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;

+       ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
+       ret->enable_subject_links = ctx.cfg.enable_subject_links;
+       ret->max_stats = ctx.cfg.max_stats;

        ret->module_link = ctx.cfg.module_link;
        ret->readme = NULL;
        ret->mtime = -1;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = NULL;
        ret->mtime = -1;

+       ret->about_filter = ctx.cfg.about_filter;
+       ret->commit_filter = ctx.cfg.commit_filter;
+       ret->source_filter = ctx.cfg.source_filter;

        return ret;
 }
 
        return ret;
 }
 


@@ -256,8 +263,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 }
 
 int cgit_diff_files(const unsigned char *old_sha1,
 }
 
 int cgit_diff_files(const unsigned char *old_sha1,

-                    const unsigned char *new_sha1,
-                    linediff_fn fn)
+                   const unsigned char *new_sha1, unsigned long *old_size,
+                   unsigned long *new_size, int *binary, linediff_fn fn)

 {
        mmfile_t file1, file2;
        xpparam_t diff_params;
 {
        mmfile_t file1, file2;
        xpparam_t diff_params;


@@ -267,6 +274,15 @@ int cgit_diff_files(const unsigned char *old_sha1,
        if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
                return 1;
 
        if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
                return 1;
 

+       *old_size = file1.size;
+       *new_size = file2.size;
+
+       if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
+           (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
+               *binary = 1;
+               return 0;
+       }
+

        memset(&diff_params, 0, sizeof(diff_params));
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        memset(&diff_params, 0, sizeof(diff_params));
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));


@@ -345,3 +361,66 @@ int cgit_parse_snapshots_mask(const char *str)
        }
        return rv;
 }
        }
        return rv;
 }

+
+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, e;
+       struct stat st;
+
+       fd = open(path, O_RDONLY);
+       if (fd == -1)
+               return errno;
+       if (fstat(fd, &st)) {
+               e = errno;
+               close(fd);
+               return e;
+       }
+       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);
+       e = errno;
+       (*buf)[*size] = '\0';
+       close(fd);
+       return (*size == st.st_size ? 0 : e);
+}