author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 20:58:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 20:58:01 (UTC) |
commit | 5b94c96a83f19a0175a8e1699d71080965793cc2 (patch) (unidiff) | |
tree | 5cc66ff2675a87c3501b2a3ce8c479f10ce701ff | |
parent | a342ac6b4d7830f82230b0f6a29bc9378d66747e (diff) | |
download | cgit-5b94c96a83f19a0175a8e1699d71080965793cc2.zip cgit-5b94c96a83f19a0175a8e1699d71080965793cc2.tar.gz cgit-5b94c96a83f19a0175a8e1699d71080965793cc2.tar.bz2 |
cgit.c: fix whitespace breakage
-rw-r--r-- | cgit.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -2,99 +2,99 @@ | |||
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | 13 | ||
14 | static struct repoinfo *cgit_get_repoinfo(char *url) | 14 | 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)) |
22 | return repo; | 22 | return repo; |
23 | } | 23 | } |
24 | return NULL; | 24 | return NULL; |
25 | } | 25 | } |
26 | 26 | ||
27 | 27 | ||
28 | static int cgit_prepare_cache(struct cacheitem *item) | 28 | static int cgit_prepare_cache(struct cacheitem *item) |
29 | { | 29 | { |
30 | if (!cgit_query_repo) { | 30 | if (!cgit_query_repo) { |
31 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 31 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
32 | item->ttl = cgit_cache_root_ttl; | 32 | item->ttl = cgit_cache_root_ttl; |
33 | return 1; | 33 | return 1; |
34 | } | 34 | } |
35 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); | 35 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); |
36 | if (!cgit_repo) { | 36 | if (!cgit_repo) { |
37 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 37 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
38 | cgit_print_docstart(title, item); | 38 | cgit_print_docstart(title, item); |
39 | cgit_print_pageheader(title, 0); | 39 | cgit_print_pageheader(title, 0); |
40 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); | 40 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); |
41 | cgit_print_docend(); | 41 | cgit_print_docend(); |
42 | return 0; | 42 | return 0; |
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; |
55 | else if (cgit_query_has_sha1) | 55 | else if (cgit_query_has_sha1) |
56 | item->ttl = cgit_cache_static_ttl; | 56 | item->ttl = cgit_cache_static_ttl; |
57 | else | 57 | else |
58 | item->ttl = cgit_cache_repo_ttl; | 58 | item->ttl = cgit_cache_repo_ttl; |
59 | } | 59 | } |
60 | return 1; | 60 | return 1; |
61 | } | 61 | } |
62 | 62 | ||
63 | static void cgit_print_repo_page(struct cacheitem *item) | 63 | static void cgit_print_repo_page(struct cacheitem *item) |
64 | { | 64 | { |
65 | char *title; | 65 | char *title; |
66 | int show_search; | 66 | int show_search; |
67 | 67 | ||
68 | if (chdir(cgit_repo->path)) { | 68 | if (chdir(cgit_repo->path)) { |
69 | title = fmt("%s - %s", cgit_root_title, "Bad request"); | 69 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
70 | cgit_print_docstart(title, item); | 70 | cgit_print_docstart(title, item); |
71 | cgit_print_pageheader(title, 0); | 71 | cgit_print_pageheader(title, 0); |
72 | cgit_print_error(fmt("Unable to scan repository: %s", | 72 | cgit_print_error(fmt("Unable to scan repository: %s", |
73 | strerror(errno))); | 73 | strerror(errno))); |
74 | cgit_print_docend(); | 74 | cgit_print_docend(); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); | 78 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
79 | show_search = 0; | 79 | show_search = 0; |
80 | setenv("GIT_DIR", cgit_repo->path, 1); | 80 | setenv("GIT_DIR", cgit_repo->path, 1); |
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 | } |
88 | if (!strcmp(cgit_query_page, "blob")) { | 88 | if (!strcmp(cgit_query_page, "blob")) { |
89 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 89 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
90 | return; | 90 | return; |
91 | } | 91 | } |
92 | } | 92 | } |
93 | 93 | ||
94 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) | 94 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) |
95 | show_search = 1; | 95 | show_search = 1; |
96 | 96 | ||
97 | cgit_print_docstart(title, item); | 97 | cgit_print_docstart(title, item); |
98 | 98 | ||
99 | 99 | ||
100 | if (!cgit_query_page) { | 100 | if (!cgit_query_page) { |
@@ -120,46 +120,46 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
120 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); | 120 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
121 | } else { | 121 | } else { |
122 | cgit_print_error("Invalid request"); | 122 | cgit_print_error("Invalid request"); |
123 | } | 123 | } |
124 | cgit_print_docend(); | 124 | cgit_print_docend(); |
125 | } | 125 | } |
126 | 126 | ||
127 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 127 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
128 | { | 128 | { |
129 | static char buf[PATH_MAX]; | 129 | static char buf[PATH_MAX]; |
130 | int stdout2; | 130 | int stdout2; |
131 | 131 | ||
132 | getcwd(buf, sizeof(buf)); | 132 | getcwd(buf, sizeof(buf)); |
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)"); |
140 | } | 140 | } |
141 | 141 | ||
142 | if (cgit_query_repo) | 142 | if (cgit_query_repo) |
143 | cgit_print_repo_page(item); | 143 | cgit_print_repo_page(item); |
144 | else | 144 | else |
145 | cgit_print_repolist(item); | 145 | cgit_print_repolist(item); |
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 | } |
153 | 153 | ||
154 | chdir(buf); | 154 | chdir(buf); |
155 | } | 155 | } |
156 | 156 | ||
157 | static void cgit_check_cache(struct cacheitem *item) | 157 | static void cgit_check_cache(struct cacheitem *item) |
158 | { | 158 | { |
159 | int i = 0; | 159 | int i = 0; |
160 | 160 | ||
161 | top: | 161 | top: |
162 | if (++i > cgit_max_lock_attempts) { | 162 | if (++i > cgit_max_lock_attempts) { |
163 | die("cgit_refresh_cache: unable to lock %s: %s", | 163 | die("cgit_refresh_cache: unable to lock %s: %s", |
164 | item->name, strerror(errno)); | 164 | item->name, strerror(errno)); |
165 | } | 165 | } |