summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-14 20:58:01 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-14 20:58:01 (UTC)
commit5b94c96a83f19a0175a8e1699d71080965793cc2 (patch) (side-by-side diff)
tree5cc66ff2675a87c3501b2a3ce8c479f10ce701ff
parenta342ac6b4d7830f82230b0f6a29bc9378d66747e (diff)
downloadcgit-5b94c96a83f19a0175a8e1699d71080965793cc2.zip
cgit-5b94c96a83f19a0175a8e1699d71080965793cc2.tar.gz
cgit-5b94c96a83f19a0175a8e1699d71080965793cc2.tar.bz2
cgit.c: fix whitespace breakage
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/cgit.c b/cgit.c
index 9e63d18..1d7a83f 100644
--- a/cgit.c
+++ b/cgit.c
@@ -2,99 +2,99 @@
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
const char cgit_version[] = CGIT_VERSION;
static struct repoinfo *cgit_get_repoinfo(char *url)
{
int i;
struct repoinfo *repo;
-
+
for (i=0; i<cgit_repolist.count; i++) {
repo = &cgit_repolist.repos[i];
if (!strcmp(repo->url, url))
return repo;
}
return NULL;
}
static int cgit_prepare_cache(struct cacheitem *item)
{
if (!cgit_query_repo) {
item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
item->ttl = cgit_cache_root_ttl;
return 1;
}
cgit_repo = cgit_get_repoinfo(cgit_query_repo);
if (!cgit_repo) {
char *title = fmt("%s - %s", cgit_root_title, "Bad request");
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
cgit_print_docend();
return 0;
}
if (!cgit_query_page) {
- item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
+ item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
cgit_repo->url));
item->ttl = cgit_cache_repo_ttl;
} else {
- item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
- cgit_repo->url, cgit_query_page,
+ item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
+ cgit_repo->url, cgit_query_page,
cache_safe_filename(cgit_querystring)));
if (cgit_query_has_symref)
item->ttl = cgit_cache_dynamic_ttl;
else if (cgit_query_has_sha1)
item->ttl = cgit_cache_static_ttl;
else
item->ttl = cgit_cache_repo_ttl;
}
return 1;
}
static void cgit_print_repo_page(struct cacheitem *item)
{
char *title;
int show_search;
if (chdir(cgit_repo->path)) {
title = fmt("%s - %s", cgit_root_title, "Bad request");
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
cgit_print_error(fmt("Unable to scan repository: %s",
strerror(errno)));
cgit_print_docend();
return;
}
title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
show_search = 0;
setenv("GIT_DIR", cgit_repo->path, 1);
if (cgit_query_page) {
if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
- cgit_print_snapshot(item, cgit_query_sha1, "zip",
+ cgit_print_snapshot(item, cgit_query_sha1, "zip",
cgit_repo->url, cgit_query_name);
return;
}
if (!strcmp(cgit_query_page, "blob")) {
cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
return;
}
}
if (cgit_query_page && !strcmp(cgit_query_page, "log"))
show_search = 1;
cgit_print_docstart(title, item);
if (!cgit_query_page) {
@@ -120,46 +120,46 @@ static void cgit_print_repo_page(struct cacheitem *item)
cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
} else {
cgit_print_error("Invalid request");
}
cgit_print_docend();
}
static void cgit_fill_cache(struct cacheitem *item, int use_cache)
{
static char buf[PATH_MAX];
int stdout2;
getcwd(buf, sizeof(buf));
item->st.st_mtime = time(NULL);
if (use_cache) {
- stdout2 = chk_positive(dup(STDOUT_FILENO),
+ stdout2 = chk_positive(dup(STDOUT_FILENO),
"Preserving STDOUT");
chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
}
if (cgit_query_repo)
cgit_print_repo_page(item);
else
cgit_print_repolist(item);
if (use_cache) {
chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
- chk_positive(dup2(stdout2, STDOUT_FILENO),
+ chk_positive(dup2(stdout2, STDOUT_FILENO),
"Restoring original STDOUT");
chk_zero(close(stdout2), "Closing temporary STDOUT");
}
chdir(buf);
}
static void cgit_check_cache(struct cacheitem *item)
{
int i = 0;
top:
if (++i > cgit_max_lock_attempts) {
die("cgit_refresh_cache: unable to lock %s: %s",
item->name, strerror(errno));
}