Add and use a common readfile() function

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index aa743bf7885ab683e1b1e1b668d73d2477d7dd71..7c7aa9bc28a714047ad2863319eb2ad52bc5ea5b 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,6 +6,10 @@
  *   (see COPYING for full license text)
  */
 
+/* This is needed for strcasestr to be defined by <string.h> */
+#define _GNU_SOURCE 1
+#include <string.h>
+
 #include <time.h>
 
 #include "cgit.h"
@@ -14,18 +18,20 @@
 
 time_t read_agefile(char *path)
 {
-       FILE *f;
-       static char buf[64], buf2[64];
+       time_t result;
+       size_t size;
+       char *buf;
+       static char buf2[64];
 
-       if (!(f = fopen(path, "r")))
-               return -1;
-       if (fgets(buf, sizeof(buf), f) == NULL)
+       if (readfile(path, &buf, &size))
                return -1;
-       fclose(f);
+
        if (parse_date(buf, buf2, sizeof(buf2)))
-               return strtoul(buf2, NULL, 10);
+               result = strtoul(buf2, NULL, 10);
        else
-               return 0;
+               result = 0;
+       free(buf);
+       return result;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
@@ -253,7 +259,7 @@ void cgit_print_repolist()
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
-                                     0, NULL, NULL);
+                                     0, NULL, NULL, ctx.qry.showmsg);
                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }
@@ -269,6 +275,11 @@ void cgit_print_repolist()
 
 void cgit_print_site_readme()
 {
-       if (ctx.cfg.root_readme)
-               html_include(ctx.cfg.root_readme);
+       if (!ctx.cfg.root_readme)
+               return;
+       if (ctx.cfg.about_filter)
+               cgit_open_filter(ctx.cfg.about_filter);
+       html_include(ctx.cfg.root_readme);
+       if (ctx.cfg.about_filter)
+               cgit_close_filter(ctx.cfg.about_filter);
 }