all repos — cgit @ 03de473354dc8c17a3b23a973b5cc67752ad20cb

a hyperfast web frontend for git written in c

cmd: no need for pre function hook now

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld Jason@zx2c4.com
Fri, 14 Aug 2015 15:54:32 +0200
commit

03de473354dc8c17a3b23a973b5cc67752ad20cb

parent

c5975ae56684a1188637f2bdba7d8e18de075abc

3 files changed, 9 insertions(+), 20 deletions(-)

jump to
M cgit.ccgit.c

@@ -733,9 +733,6 @@

if (ctx.repo && prepare_repo_cmd()) return; - if (cmd->pre) - cmd->pre(); - cmd->fn(); }
M cmd.ccmd.c

@@ -38,19 +38,15 @@ }

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)

@@ -145,8 +141,6 @@ {

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 @@ {

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),
M cmd.hcmd.h

@@ -2,12 +2,10 @@ #ifndef CMD_H

#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;