mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-23 08:58:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: no need for pre function hook now

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2015-08-14 15:54:32 +02:00
parent c5975ae566
commit 03de473354
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cgit.c
View File

@ -733,9 +733,6 @@ static void process_request(void)
if (ctx.repo && prepare_repo_cmd()) if (ctx.repo && prepare_repo_cmd())
return; return;
if (cmd->pre)
cmd->pre();
cmd->fn(); cmd->fn();
} }

24
cmd.c
View File

@ -38,21 +38,17 @@ static void atom_fn(void)
static void about_fn(void) static void about_fn(void)
{ {
if (ctx.repo) if (ctx.repo) {
cgit_print_repo_readme(ctx.qry.path); if (!ctx.qry.path &&
else 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(); 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) static void blob_fn(void)
{ {
cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0); 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); 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) \ #define def_cmd(name, want_repo, want_vpath, is_clone) \
{#name, name##_fn, NULL, 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[] = { static struct cgit_cmd cmds[] = {
def_cmd(HEAD, 1, 0, 1), def_cmd(HEAD, 1, 0, 1),
def_cmd(atom, 1, 0, 0), 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(blob, 1, 0, 0),
def_cmd(commit, 1, 1, 0), def_cmd(commit, 1, 1, 0),
def_cmd(diff, 1, 1, 0), def_cmd(diff, 1, 1, 0),

2
cmd.h
View File

@ -2,12 +2,10 @@
#define CMD_H #define CMD_H
typedef void (*cgit_cmd_fn)(void); typedef void (*cgit_cmd_fn)(void);
typedef void (*cgit_cmd_pre_fn)(void);
struct cgit_cmd { struct cgit_cmd {
const char *name; const char *name;
cgit_cmd_fn fn; cgit_cmd_fn fn;
cgit_cmd_pre_fn pre;
unsigned int want_repo:1, unsigned int want_repo:1,
want_vpath:1, want_vpath:1,
is_clone:1; is_clone:1;