diff options
| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cmd.c | 24 | ||||
| -rw-r--r-- | cmd.h | 2 |
3 files changed, 9 insertions, 20 deletions
diff --git a/cgit.c b/cgit.c index 7271412..28a2f14 100644 --- a/cgit.c +++ b/cgit.c @@ -733,9 +733,6 @@ static void process_request(void) if (ctx.repo && prepare_repo_cmd()) return; - if (cmd->pre) - cmd->pre(); - cmd->fn(); } diff --git a/cmd.c b/cmd.c index 05494fe..20c80b0 100644 --- a/cmd.c +++ b/cmd.c @@ -38,21 +38,17 @@ static void atom_fn(void) static void about_fn(void) { - if (ctx.repo) - cgit_print_repo_readme(ctx.qry.path); - else + if (ctx.repo) { + if (!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); + else + cgit_print_repo_readme(ctx.qry.path); + } 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,8 +141,6 @@ static void tree_fn(void) cgit_print_tree(ctx.qry.sha1, ctx.qry.path); } -#define def_cmp(name, want_repo, want_vpath, is_clone) \ - {#name, name##_fn, name##_pre, want_repo, want_vpath, is_clone} #define def_cmd(name, want_repo, want_vpath, is_clone) \ {#name, name##_fn, NULL, want_repo, want_vpath, is_clone} @@ -155,7 +149,7 @@ struct cgit_cmd *cgit_get_cmd(void) static struct cgit_cmd cmds[] = { def_cmd(HEAD, 1, 0, 1), def_cmd(atom, 1, 0, 0), - def_cmp(about, 0, 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), diff --git a/cmd.h b/cmd.h index 1a98089..6249b1d 100644 --- a/cmd.h +++ b/cmd.h @@ -2,12 +2,10 @@ #define CMD_H typedef void (*cgit_cmd_fn)(void); -typedef void (*cgit_cmd_pre_fn)(void); struct cgit_cmd { const char *name; cgit_cmd_fn fn; - cgit_cmd_pre_fn pre; unsigned int want_repo:1, want_vpath:1, is_clone:1; |