scan_path(): Improve handling of inaccessible directories

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 41b5225616933bcc7ab80a155ef0f7ba6c65b4cd..b9771fa772599c73029e7dec351475e363d2360d 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -101,7 +101,7 @@ void print_commit(struct commit *commit)
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                files = 0;
                add_lines = 0;
                rem_lines = 0;

-               cgit_diff_commit(commit, inspect_files);
+               cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);

                html("</td><td>");
                htmlf("%d", files);
                if (ctx.repo->enable_log_linecount) {
                html("</td><td>");
                htmlf("%d", files);
                if (ctx.repo->enable_log_linecount) {


@@ -162,7 +162,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
        argv[1] = disambiguate_ref(tip);
 
 
        argv[1] = disambiguate_ref(tip);
 

-       if (grep && pattern) {
+       if (grep && pattern && *pattern) {

                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer"))
                        argv[argc++] = fmt("--%s=%s", grep, pattern);
                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer"))
                        argv[argc++] = fmt("--%s=%s", grep, pattern);