diff options
-rw-r--r-- | cgit.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -15,7 +15,7 @@ static struct repoinfo *cgit_get_repoinfo(char *url) | |||
15 | { | 15 | { |
16 | int i; | 16 | int i; |
17 | struct repoinfo *repo; | 17 | struct repoinfo *repo; |
18 | 18 | ||
19 | for (i=0; i<cgit_repolist.count; i++) { | 19 | for (i=0; i<cgit_repolist.count; i++) { |
20 | repo = &cgit_repolist.repos[i]; | 20 | repo = &cgit_repolist.repos[i]; |
21 | if (!strcmp(repo->url, url)) | 21 | if (!strcmp(repo->url, url)) |
@@ -43,12 +43,12 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
43 | } | 43 | } |
44 | 44 | ||
45 | if (!cgit_query_page) { | 45 | if (!cgit_query_page) { |
46 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, | 46 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
47 | cgit_repo->url)); | 47 | cgit_repo->url)); |
48 | item->ttl = cgit_cache_repo_ttl; | 48 | item->ttl = cgit_cache_repo_ttl; |
49 | } else { | 49 | } else { |
50 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 50 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
51 | cgit_repo->url, cgit_query_page, | 51 | cgit_repo->url, cgit_query_page, |
52 | cache_safe_filename(cgit_querystring))); | 52 | cache_safe_filename(cgit_querystring))); |
53 | if (cgit_query_has_symref) | 53 | if (cgit_query_has_symref) |
54 | item->ttl = cgit_cache_dynamic_ttl; | 54 | item->ttl = cgit_cache_dynamic_ttl; |
@@ -81,7 +81,7 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
81 | 81 | ||
82 | if (cgit_query_page) { | 82 | if (cgit_query_page) { |
83 | if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { | 83 | if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { |
84 | cgit_print_snapshot(item, cgit_query_sha1, "zip", | 84 | cgit_print_snapshot(item, cgit_query_sha1, "zip", |
85 | cgit_repo->url, cgit_query_name); | 85 | cgit_repo->url, cgit_query_name); |
86 | return; | 86 | return; |
87 | } | 87 | } |
@@ -133,7 +133,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache) | |||
133 | item->st.st_mtime = time(NULL); | 133 | item->st.st_mtime = time(NULL); |
134 | 134 | ||
135 | if (use_cache) { | 135 | if (use_cache) { |
136 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 136 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
137 | "Preserving STDOUT"); | 137 | "Preserving STDOUT"); |
138 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 138 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
139 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 139 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
@@ -146,7 +146,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache) | |||
146 | 146 | ||
147 | if (use_cache) { | 147 | if (use_cache) { |
148 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 148 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
149 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 149 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
150 | "Restoring original STDOUT"); | 150 | "Restoring original STDOUT"); |
151 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 151 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
152 | } | 152 | } |