ui-patch.c: Fix signature delimiter

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 76fe71a9a4bfca98c8340deba3b8ee68cb69b9c3..2ab6e9e41cca24fa9a2e3ad17682090cfc592e20 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -33,7 +33,7 @@ static time_t read_agefile(char *path)
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {

-       char *path;
+       struct strbuf path = STRBUF_INIT;

        struct stat s;
        struct cgit_repo *r = (struct cgit_repo *)repo;
 
        struct stat s;
        struct cgit_repo *r = (struct cgit_repo *)repo;
 


@@ -41,32 +41,36 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
                *mtime = repo->mtime;
                return 1;
        }
                *mtime = repo->mtime;
                return 1;
        }

-       path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
-       if (stat(path, &s) == 0) {
-               *mtime = read_agefile(path);
+       strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile);
+       if (stat(path.buf, &s) == 0) {
+               *mtime = read_agefile(path.buf);

                if (*mtime) {
                        r->mtime = *mtime;
                if (*mtime) {
                        r->mtime = *mtime;

-                       return 1;
+                       goto end;

                }
        }
 
                }
        }
 

-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
-                  repo->defbranch : "master");
-       if (stat(path, &s) == 0) {
+       strbuf_reset(&path);
+       strbuf_addf(&path, "%s/refs/heads/%s", repo->path,
+                   repo->defbranch ? repo->defbranch : "master");
+       if (stat(path.buf, &s) == 0) {

                *mtime = s.st_mtime;
                r->mtime = *mtime;
                *mtime = s.st_mtime;
                r->mtime = *mtime;

-               return 1;
+               goto end;

        }
 
        }
 

-       path = fmt("%s/%s", repo->path, "packed-refs");
-       if (stat(path, &s) == 0) {
+       strbuf_reset(&path);
+       strbuf_addf(&path, "%s/%s", repo->path, "packed-refs");
+       if (stat(path.buf, &s) == 0) {

                *mtime = s.st_mtime;
                r->mtime = *mtime;
                *mtime = s.st_mtime;
                r->mtime = *mtime;

-               return 1;
+               goto end;

        }
 
        *mtime = 0;
        r->mtime = *mtime;
        }
 
        *mtime = 0;
        r->mtime = *mtime;

+end:
+       strbuf_release(&path);

        return (r->mtime != 0);
 }
 
        return (r->mtime != 0);
 }
 


@@ -328,9 +332,13 @@ void cgit_print_site_readme()
 {
        if (!ctx.cfg.root_readme)
                return;
 {
        if (!ctx.cfg.root_readme)
                return;

-       if (ctx.cfg.about_filter)
+       if (ctx.cfg.about_filter) {
+               ctx.cfg.about_filter->argv[1] = ctx.cfg.root_readme;

                cgit_open_filter(ctx.cfg.about_filter);
                cgit_open_filter(ctx.cfg.about_filter);

+       }

        html_include(ctx.cfg.root_readme);
        html_include(ctx.cfg.root_readme);

-       if (ctx.cfg.about_filter)
+       if (ctx.cfg.about_filter) {

                cgit_close_filter(ctx.cfg.about_filter);
                cgit_close_filter(ctx.cfg.about_filter);

+               ctx.cfg.about_filter->argv[1] = NULL;
+       }

 }
 }