Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index a27ab30716f276e4f6644e11734b19bc7cff1d5c..d0973ab8dfa50fd77fadf59d6111c7df5f62c97e 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -10,7 +10,6 @@
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
-int cgit_cmd;
 
 int chk_zero(int result, char *msg)
 {
@@ -59,6 +58,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        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->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = NULL;
@@ -262,7 +262,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,
-                   unsigned long *new_size, int *binary, linediff_fn fn)
+                   unsigned long *new_size, int *binary, int context,
+                   int ignorews, linediff_fn fn)
 {
        mmfile_t file1, file2;
        xpparam_t diff_params;
@@ -285,7 +286,9 @@ int cgit_diff_files(const unsigned char *old_sha1,
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;
-       emit_params.ctxlen = 3;
+       if (ignorews)
+               diff_params.flags |= XDF_IGNORE_WHITESPACE;
+       emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
@@ -295,7 +298,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,
-                   filepair_fn fn, const char *prefix)
+                   filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
        int ret;
@@ -306,6 +309,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
        DIFF_OPT_SET(&opt, RECURSIVE);
+       if (ignorews)
+               DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
@@ -330,7 +335,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;
-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+                      ctx.qry.ignorews);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
@@ -400,15 +406,16 @@ int cgit_close_filter(struct cgit_filter *filter)
  */
 int readfile(const char *path, char **buf, size_t *size)
 {
-       int fd;
+       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 errno;
+               return e;
        }
        if (!S_ISREG(st.st_mode)) {
                close(fd);
@@ -416,7 +423,8 @@ int readfile(const char *path, char **buf, size_t *size)
        }
        *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 : errno);
+       return (*size == st.st_size ? 0 : e);
 }