| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cmd.c | 24 | ||||
| -rw-r--r-- | cmd.h | 2 |
3 files changed, 20 insertions, 9 deletions
@@ -733,6 +733,9 @@ static void process_request(void) if (ctx.repo && prepare_repo_cmd()) return; + if (cmd->pre) + cmd->pre(); + cmd->fn(); } @@ -38,17 +38,21 @@ static void atom_fn(void) static void about_fn(void) { - 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 + if (ctx.repo) + 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); @@ -141,6 +145,8 @@ 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} @@ -149,7 +155,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_cmd(about, 0, 0, 0), + def_cmp(about, 0, 0, 0), def_cmd(blob, 1, 0, 0), def_cmd(commit, 1, 1, 0), def_cmd(diff, 1, 1, 0), @@ -2,10 +2,12 @@ #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; |