Enable default value for head parameter

Pages which expect head to be specified in the querystring can now be
given a default value, configurable per repository (via repo.defbranch,
which defaults to "master").

Currently, only the log page actually works without parameters, but the
defbranch is bound to be exploited.

This also removes some dead code from shared.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
这个提交包含在:
Lars Hjemli 2007-05-16 00:14:51 +02:00
父节点 47a81c77fd
当前提交 b28b105ec1
共有 3 个文件被更改,包括 7 次插入14 次删除

3
cgit.c
查看文件

@ -65,6 +65,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
char *title; char *title;
int show_search; int show_search;
if (!cgit_query_head)
cgit_query_head = cgit_repo->defbranch;
if (chdir(cgit_repo->path)) { if (chdir(cgit_repo->path)) {
title = fmt("%s - %s", cgit_root_title, "Bad request"); title = fmt("%s - %s", cgit_root_title, "Bad request");
cgit_print_docstart(title, item); cgit_print_docstart(title, item);

1
cgit.h
查看文件

@ -35,6 +35,7 @@ struct repoinfo {
char *path; char *path;
char *desc; char *desc;
char *owner; char *owner;
char *defbranch;
char *module_link; char *module_link;
int snapshots; int snapshots;
}; };

查看文件

@ -32,10 +32,6 @@ int cgit_cache_max_create_time = 5;
int cgit_max_msg_len = 60; int cgit_max_msg_len = 60;
int cgit_max_commit_count = 50; int cgit_max_commit_count = 50;
char *cgit_repo_name = NULL;
char *cgit_repo_desc = NULL;
char *cgit_repo_owner = NULL;
int cgit_query_has_symref = 0; int cgit_query_has_symref = 0;
int cgit_query_has_sha1 = 0; int cgit_query_has_sha1 = 0;
@ -86,6 +82,7 @@ struct repoinfo *add_repo(const char *url)
ret->path = NULL; ret->path = NULL;
ret->desc = NULL; ret->desc = NULL;
ret->owner = NULL; ret->owner = NULL;
ret->defbranch = "master";
ret->snapshots = cgit_snapshots; ret->snapshots = cgit_snapshots;
ret->module_link = cgit_module_link; ret->module_link = cgit_module_link;
return ret; return ret;
@ -133,6 +130,8 @@ void cgit_global_config_cb(const char *name, const char *value)
cgit_repo->desc = xstrdup(value); cgit_repo->desc = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.owner")) else if (cgit_repo && !strcmp(name, "repo.owner"))
cgit_repo->owner = xstrdup(value); cgit_repo->owner = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.defbranch"))
cgit_repo->defbranch = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.snapshots")) else if (cgit_repo && !strcmp(name, "repo.snapshots"))
cgit_repo->snapshots = atoi(value); cgit_repo->snapshots = atoi(value);
else if (cgit_repo && !strcmp(name, "repo.module-link")) else if (cgit_repo && !strcmp(name, "repo.module-link"))
@ -141,16 +140,6 @@ void cgit_global_config_cb(const char *name, const char *value)
cgit_read_config(value, cgit_global_config_cb); cgit_read_config(value, cgit_global_config_cb);
} }
void cgit_repo_config_cb(const char *name, const char *value)
{
if (!strcmp(name, "name"))
cgit_repo_name = xstrdup(value);
else if (!strcmp(name, "desc"))
cgit_repo_desc = xstrdup(value);
else if (!strcmp(name, "owner"))
cgit_repo_owner = xstrdup(value);
}
void cgit_querystring_cb(const char *name, const char *value) void cgit_querystring_cb(const char *name, const char *value)
{ {
if (!strcmp(name,"r")) { if (!strcmp(name,"r")) {