crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve initialization of git directory

Browse Source 
Using the functions offered by libgit feels like the right thing to do. Also,
make sure that config errors gets properly reported.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-02-16 21:16:53 +01:00
parent d1f3bbe9d2
commit b88fb016d0
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cgit.c
View File

@ -83,20 +83,23 @@ static void cgit_print_repo_page(struct cacheitem *item)
char *title, *tmp; char *title, *tmp;
int show_search; int show_search;
unsigned char sha1[20]; unsigned char sha1[20];
int nongit = 0;
if (chdir(ctx.repo->path)) { setenv("GIT_DIR", ctx.repo->path, 1);
title = fmt("%s - %s", ctx.cfg.root_title, "Bad request"); setup_git_directory_gently(&nongit);
if (nongit) {
title = fmt("%s - %s", ctx.cfg.root_title, "config error");
tmp = fmt("Not a git repository: '%s'", ctx.repo->path);
ctx.repo = NULL;
cgit_print_docstart(title, item); cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0); cgit_print_pageheader(title, 0);
cgit_print_error(fmt("Unable to scan repository: %s", cgit_print_error(tmp);
strerror(errno)));
cgit_print_docend(); cgit_print_docend();
return; return;
} }
title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc); title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
show_search = 0; show_search = 0;
setenv("GIT_DIR", ctx.repo->path, 1);
if (!ctx.qry.head) { if (!ctx.qry.head) {
ctx.qry.head = xstrdup(find_default_branch(ctx.repo)); ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
@ -179,10 +182,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
static void cgit_fill_cache(struct cacheitem *item, int use_cache) static void cgit_fill_cache(struct cacheitem *item, int use_cache)
{ {
static char buf[PATH_MAX];
int stdout2; int stdout2;
getcwd(buf, sizeof(buf));
item->st.st_mtime = time(NULL); item->st.st_mtime = time(NULL);
if (use_cache) { if (use_cache) {
@ -203,8 +204,6 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
"Restoring original STDOUT"); "Restoring original STDOUT");
chk_zero(close(stdout2), "Closing temporary STDOUT"); chk_zero(close(stdout2), "Closing temporary STDOUT");
} }
chdir(buf);
} }
static void cgit_check_cache(struct cacheitem *item) static void cgit_check_cache(struct cacheitem *item)

2
ui-shared.c
View File

@ -476,7 +476,7 @@ void cgit_print_pageheader(char *title, int show_search)
htmlf("'><img src='%s' alt='cgit'/></a>\n", htmlf("'><img src='%s' alt='cgit'/></a>\n",
ctx.cfg.logo); ctx.cfg.logo);
html("</td></tr>\n<tr><td class='sidebar'>\n"); html("</td></tr>\n<tr><td class='sidebar'>\n");
if (ctx.qry.repo) { if (ctx.repo) {
html("<h1 class='first'>"); html("<h1 class='first'>");
html_txt(strrpart(ctx.repo->name, 20)); html_txt(strrpart(ctx.repo->name, 20));
html("</h1>\n"); html("</h1>\n");