Hosted on HTTPS now

[cgit.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 315edc3519486bb0d921c20289e6aefcc90df031..d280e95fb0928b853fdf33ad68edcd56273d9018 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -38,21 +38,31 @@ static void atom_fn(void)
 
 static void about_fn(void)
 {
-       if (ctx.repo)
-               cgit_print_repo_readme(ctx.qry.path);
-       else
+       if (ctx.repo) {
+               size_t path_info_len = ctx.env.path_info ? strlen(ctx.env.path_info) : 0;
+               if (!ctx.qry.path &&
+                   ctx.qry.url[strlen(ctx.qry.url) - 1] != '/' &&
+                   (!path_info_len || ctx.env.path_info[path_info_len - 1] != '/')) {
+                       char *currenturl = cgit_currenturl();
+                       char *redirect = fmtalloc("%s/", currenturl);
+                       cgit_redirect(redirect, true);
+                       free(currenturl);
+                       free(redirect);
+               } else if (ctx.repo->readme.nr)
+                       cgit_print_repo_readme(ctx.qry.path);
+               else if (ctx.repo->homepage)
+                       cgit_redirect(ctx.repo->homepage, false);
+               else {
+                       char *currenturl = cgit_currenturl();
+                       char *redirect = fmtalloc("%s../", currenturl);
+                       cgit_redirect(redirect, false);
+                       free(currenturl);
+                       free(redirect);
+               }
+       } else
                cgit_print_site_readme();
 }
 
-static void about_pre(void)
-{
-       if (ctx.repo &&
-           !ctx.qry.path &&
-           ctx.qry.url[strlen(ctx.qry.url) - 1] != '/' &&
-           ctx.env.path_info[strlen(ctx.env.path_info) - 1] != '/')
-               cgit_redirect(fmtalloc("%s/", cgit_currenturl()), true);
-}
-
 static void blob_fn(void)
 {
        cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0);
@@ -145,34 +155,32 @@ static void tree_fn(void)
        cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
 }
 
-#define def_cmp(name, want_repo, want_layout, want_vpath, is_clone) \
-       {#name, name##_fn, name##_pre, want_repo, want_layout, want_vpath, is_clone}
-#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
-       {#name, name##_fn, NULL, want_repo, want_layout, want_vpath, is_clone}
+#define def_cmd(name, want_repo, want_vpath, is_clone) \
+       {#name, name##_fn, want_repo, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(void)
 {
        static struct cgit_cmd cmds[] = {
-               def_cmd(HEAD, 1, 0, 0, 1),
-               def_cmd(atom, 1, 0, 0, 0),
-               def_cmp(about, 0, 1, 0, 0),
-               def_cmd(blob, 1, 0, 0, 0),
-               def_cmd(commit, 1, 1, 1, 0),
-               def_cmd(diff, 1, 1, 1, 0),
-               def_cmd(info, 1, 0, 0, 1),
-               def_cmd(log, 1, 1, 1, 0),
-               def_cmd(ls_cache, 0, 0, 0, 0),
-               def_cmd(objects, 1, 0, 0, 1),
-               def_cmd(patch, 1, 0, 1, 0),
-               def_cmd(plain, 1, 0, 0, 0),
-               def_cmd(rawdiff, 1, 0, 1, 0),
-               def_cmd(refs, 1, 1, 0, 0),
-               def_cmd(repolist, 0, 0, 0, 0),
-               def_cmd(snapshot, 1, 0, 0, 0),
-               def_cmd(stats, 1, 1, 1, 0),
-               def_cmd(summary, 1, 1, 0, 0),
-               def_cmd(tag, 1, 1, 0, 0),
-               def_cmd(tree, 1, 1, 1, 0),
+               def_cmd(HEAD, 1, 0, 1),
+               def_cmd(atom, 1, 0, 0),
+               def_cmd(about, 0, 0, 0),
+               def_cmd(blob, 1, 0, 0),
+               def_cmd(commit, 1, 1, 0),
+               def_cmd(diff, 1, 1, 0),
+               def_cmd(info, 1, 0, 1),
+               def_cmd(log, 1, 1, 0),
+               def_cmd(ls_cache, 0, 0, 0),
+               def_cmd(objects, 1, 0, 1),
+               def_cmd(patch, 1, 1, 0),
+               def_cmd(plain, 1, 0, 0),
+               def_cmd(rawdiff, 1, 1, 0),
+               def_cmd(refs, 1, 0, 0),
+               def_cmd(repolist, 0, 0, 0),
+               def_cmd(snapshot, 1, 0, 0),
+               def_cmd(stats, 1, 1, 0),
+               def_cmd(summary, 1, 0, 0),
+               def_cmd(tag, 1, 0, 0),
+               def_cmd(tree, 1, 1, 0),
        };
        int i;