readme: Accept multiple candidates and test them.

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index e3ec533e0719ac1f34623dab2977d0a6c87af274..f738b83acd4d442327cc3d721ac367b4d5666f29 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -14,6 +14,8 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-stats.h"
+#include "ui-blob.h"
+#include "ui-summary.h"
 #include "scan-tree.h"
 
 const char *cgit_version = CGIT_VERSION;
@@ -37,10 +39,10 @@ static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
        switch (filtertype) {
                case SOURCE:
+               case ABOUT:
                        extra_args = 1;
                        break;
 
-               case ABOUT:
                case COMMIT:
                default:
                        extra_args = 0;
@@ -469,10 +471,40 @@ static char *guess_defbranch(void)
        return xstrdup(ref + 11);
 }
 
+static void choose_readme(struct cgit_repo *repo)
+{
+       char *entry, *filename, *ref;
+
+       /* If there's no space, we skip the possibly expensive
+        * selection process. */
+       if (!repo->readme || !strchr(repo->readme, ' '))
+               return;
+
+       for (entry = strtok(repo->readme, " "); entry; entry = strtok(NULL, " ")) {
+               cgit_parse_readme(entry, NULL, &filename, &ref, repo);
+               if (!(*filename)) {
+                       free(filename);
+                       free(ref);
+                       continue;
+               }
+               if (*ref && cgit_ref_path_exists(filename, ref)) {
+                       free(filename);
+                       free(ref);
+                       break;
+               }
+               if (!access(filename, R_OK)) {
+                       free(filename);
+                       free(ref);
+                       break;
+               }
+               free(filename);
+               free(ref);
+       }
+       repo->readme = entry;
+}
+
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {
-       char *user_home;
-       char *xdg_home;
        unsigned char sha1[20];
        int nongit = 0;
        int rc;
@@ -483,11 +515,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        /* Do not look in /etc/ for gitconfig and gitattributes. */
        setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
        setenv("GIT_ATTR_NOSYSTEM", "1", 1);
-
-       /* We unset HOME and XDG_CONFIG_HOME before calling the git setup function
-        * so that we don't make unneccessary filesystem accesses. */
-       user_home = getenv("HOME");
-       xdg_home = getenv("XDG_CONFIG_HOME");
        unsetenv("HOME");
        unsetenv("XDG_CONFIG_HOME");
 
@@ -497,12 +524,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        setup_git_directory_gently(&nongit);
        init_display_notes(NULL);
 
-       /* We restore the unset variables afterward. */
-       if (user_home)
-               setenv("HOME", user_home, 1);
-       if (xdg_home)
-               setenv("XDG_CONFIG_HOME", xdg_home, 1);
-
        if (nongit) {
                const char *name = ctx->repo->name;
                rc = errno;
@@ -550,6 +571,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        }
        sort_string_list(&ctx->repo->submodules);
        cgit_prepare_repo_env(ctx->repo);
+       choose_readme(ctx->repo);
        return 0;
 }