Handle binary files in diffs

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 89d1bab90f9e6d4f53ee873dfffb4fb9515bedbd..dbb84d84cae97790426df67f61cd4cb305a39dce 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -58,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->snapshots = ctx.cfg.snapshots;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;

+       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;


@@ -256,8 +257,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,10 +268,21 @@ 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 (buffer_is_binary(file1.ptr, file1.size) ||
+           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));

        diff_params.flags = XDF_NEED_MINIMAL;
        emit_params.ctxlen = 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
        diff_params.flags = XDF_NEED_MINIMAL;
        emit_params.ctxlen = 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;

-       emit_params.find_func = NULL;

        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);