summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-02-16 12:56:09 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-02-16 12:56:09 (UTC)
commitd1f3bbe9d22029f45a77bb938c176ccc0c827d46 (patch) (unidiff)
tree3f1741c012763cbc5485f31377abdd9241fbac6b
parentb228d4ff82a65fdcd4a7364759fe36a0bdda5978 (diff)
downloadcgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.zip
cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.gz
cgit-d1f3bbe9d22029f45a77bb938c176ccc0c827d46.tar.bz2
Move cgit_repo into cgit_context
This removes the global variable which is used to keep track of the currently selected repository, and adds a new variable in the cgit_context structure. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cache.c6
-rw-r--r--cgit.c31
-rw-r--r--cgit.h12
-rw-r--r--parsing.c16
-rw-r--r--shared.c61
-rw-r--r--ui-commit.c4
-rw-r--r--ui-log.c10
-rw-r--r--ui-repolist.c30
-rw-r--r--ui-shared.c28
-rw-r--r--ui-summary.c4
-rw-r--r--ui-tree.c2
11 files changed, 101 insertions, 103 deletions
diff --git a/cache.c b/cache.c
index 2ed0d6f..7860fc7 100644
--- a/cache.c
+++ b/cache.c
@@ -1,119 +1,119 @@
1/* cache.c: cache management 1/* cache.c: cache management
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
11const int NOLOCK = -1; 11const int NOLOCK = -1;
12 12
13char *cache_safe_filename(const char *unsafe) 13char *cache_safe_filename(const char *unsafe)
14{ 14{
15 static char buf[4][PATH_MAX]; 15 static char buf[4][PATH_MAX];
16 static int bufidx; 16 static int bufidx;
17 char *s; 17 char *s;
18 char c; 18 char c;
19 19
20 bufidx++; 20 bufidx++;
21 bufidx &= 3; 21 bufidx &= 3;
22 s = buf[bufidx]; 22 s = buf[bufidx];
23 23
24 while(unsafe && (c = *unsafe++) != 0) { 24 while(unsafe && (c = *unsafe++) != 0) {
25 if (c == '/' || c == ' ' || c == '&' || c == '|' || 25 if (c == '/' || c == ' ' || c == '&' || c == '|' ||
26 c == '>' || c == '<' || c == '.') 26 c == '>' || c == '<' || c == '.')
27 c = '_'; 27 c = '_';
28 *s++ = c; 28 *s++ = c;
29 } 29 }
30 *s = '\0'; 30 *s = '\0';
31 return buf[bufidx]; 31 return buf[bufidx];
32} 32}
33 33
34int cache_exist(struct cacheitem *item) 34int cache_exist(struct cacheitem *item)
35{ 35{
36 if (stat(item->name, &item->st)) { 36 if (stat(item->name, &item->st)) {
37 item->st.st_mtime = 0; 37 item->st.st_mtime = 0;
38 return 0; 38 return 0;
39 } 39 }
40 return 1; 40 return 1;
41} 41}
42 42
43int cache_create_dirs() 43int cache_create_dirs()
44{ 44{
45 char *path; 45 char *path;
46 46
47 path = fmt("%s", ctx.cfg.cache_root); 47 path = fmt("%s", ctx.cfg.cache_root);
48 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 48 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
49 return 0; 49 return 0;
50 50
51 if (!cgit_repo) 51 if (!ctx.repo)
52 return 0; 52 return 0;
53 53
54 path = fmt("%s/%s", ctx.cfg.cache_root, 54 path = fmt("%s/%s", ctx.cfg.cache_root,
55 cache_safe_filename(cgit_repo->url)); 55 cache_safe_filename(ctx.repo->url));
56 56
57 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 57 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
58 return 0; 58 return 0;
59 59
60 if (ctx.qry.page) { 60 if (ctx.qry.page) {
61 path = fmt("%s/%s/%s", ctx.cfg.cache_root, 61 path = fmt("%s/%s/%s", ctx.cfg.cache_root,
62 cache_safe_filename(cgit_repo->url), 62 cache_safe_filename(ctx.repo->url),
63 ctx.qry.page); 63 ctx.qry.page);
64 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 64 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
65 return 0; 65 return 0;
66 } 66 }
67 return 1; 67 return 1;
68} 68}
69 69
70int cache_refill_overdue(const char *lockfile) 70int cache_refill_overdue(const char *lockfile)
71{ 71{
72 struct stat st; 72 struct stat st;
73 73
74 if (stat(lockfile, &st)) 74 if (stat(lockfile, &st))
75 return 0; 75 return 0;
76 else 76 else
77 return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time); 77 return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
78} 78}
79 79
80int cache_lock(struct cacheitem *item) 80int cache_lock(struct cacheitem *item)
81{ 81{
82 int i = 0; 82 int i = 0;
83 char *lockfile = xstrdup(fmt("%s.lock", item->name)); 83 char *lockfile = xstrdup(fmt("%s.lock", item->name));
84 84
85 top: 85 top:
86 if (++i > ctx.cfg.max_lock_attempts) 86 if (++i > ctx.cfg.max_lock_attempts)
87 die("cache_lock: unable to lock %s: %s", 87 die("cache_lock: unable to lock %s: %s",
88 item->name, strerror(errno)); 88 item->name, strerror(errno));
89 89
90 item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); 90 item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
91 91
92 if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) 92 if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs())
93 goto top; 93 goto top;
94 94
95 if (item->fd == NOLOCK && errno == EEXIST && 95 if (item->fd == NOLOCK && errno == EEXIST &&
96 cache_refill_overdue(lockfile) && !unlink(lockfile)) 96 cache_refill_overdue(lockfile) && !unlink(lockfile))
97 goto top; 97 goto top;
98 98
99 free(lockfile); 99 free(lockfile);
100 return (item->fd > 0); 100 return (item->fd > 0);
101} 101}
102 102
103int cache_unlock(struct cacheitem *item) 103int cache_unlock(struct cacheitem *item)
104{ 104{
105 close(item->fd); 105 close(item->fd);
106 return (rename(fmt("%s.lock", item->name), item->name) == 0); 106 return (rename(fmt("%s.lock", item->name), item->name) == 0);
107} 107}
108 108
109int cache_cancel_lock(struct cacheitem *item) 109int cache_cancel_lock(struct cacheitem *item)
110{ 110{
111 return (unlink(fmt("%s.lock", item->name)) == 0); 111 return (unlink(fmt("%s.lock", item->name)) == 0);
112} 112}
113 113
114int cache_expired(struct cacheitem *item) 114int cache_expired(struct cacheitem *item)
115{ 115{
116 if (item->ttl < 0) 116 if (item->ttl < 0)
117 return 0; 117 return 0;
118 return item->st.st_mtime + item->ttl * 60 < time(NULL); 118 return item->st.st_mtime + item->ttl * 60 < time(NULL);
119} 119}
diff --git a/cgit.c b/cgit.c
index f0907a1..b270fdc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,319 +1,318 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
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
11static int cgit_prepare_cache(struct cacheitem *item) 11static int cgit_prepare_cache(struct cacheitem *item)
12{ 12{
13 if (!cgit_repo && ctx.qry.repo) { 13 if (!ctx.repo && ctx.qry.repo) {
14 char *title = fmt("%s - %s", ctx.cfg.root_title, "Bad request"); 14 char *title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
15 cgit_print_docstart(title, item); 15 cgit_print_docstart(title, item);
16 cgit_print_pageheader(title, 0); 16 cgit_print_pageheader(title, 0);
17 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); 17 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
18 cgit_print_docend(); 18 cgit_print_docend();
19 return 0; 19 return 0;
20 } 20 }
21 21
22 if (!cgit_repo) { 22 if (!ctx.repo) {
23 item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); 23 item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
24 item->ttl = ctx.cfg.cache_root_ttl; 24 item->ttl = ctx.cfg.cache_root_ttl;
25 return 1; 25 return 1;
26 } 26 }
27 27
28 if (!cgit_cmd) { 28 if (!cgit_cmd) {
29 item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, 29 item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
30 cache_safe_filename(cgit_repo->url), 30 cache_safe_filename(ctx.repo->url),
31 cache_safe_filename(ctx.qry.raw))); 31 cache_safe_filename(ctx.qry.raw)));
32 item->ttl = ctx.cfg.cache_repo_ttl; 32 item->ttl = ctx.cfg.cache_repo_ttl;
33 } else { 33 } else {
34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, 34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
35 cache_safe_filename(cgit_repo->url), 35 cache_safe_filename(ctx.repo->url),
36 ctx.qry.page, 36 ctx.qry.page,
37 cache_safe_filename(ctx.qry.raw))); 37 cache_safe_filename(ctx.qry.raw)));
38 if (ctx.qry.has_symref) 38 if (ctx.qry.has_symref)
39 item->ttl = ctx.cfg.cache_dynamic_ttl; 39 item->ttl = ctx.cfg.cache_dynamic_ttl;
40 else if (ctx.qry.has_sha1) 40 else if (ctx.qry.has_sha1)
41 item->ttl = ctx.cfg.cache_static_ttl; 41 item->ttl = ctx.cfg.cache_static_ttl;
42 else 42 else
43 item->ttl = ctx.cfg.cache_repo_ttl; 43 item->ttl = ctx.cfg.cache_repo_ttl;
44 } 44 }
45 return 1; 45 return 1;
46} 46}
47 47
48struct refmatch { 48struct refmatch {
49 char *req_ref; 49 char *req_ref;
50 char *first_ref; 50 char *first_ref;
51 int match; 51 int match;
52}; 52};
53 53
54int find_current_ref(const char *refname, const unsigned char *sha1, 54int find_current_ref(const char *refname, const unsigned char *sha1,
55 int flags, void *cb_data) 55 int flags, void *cb_data)
56{ 56{
57 struct refmatch *info; 57 struct refmatch *info;
58 58
59 info = (struct refmatch *)cb_data; 59 info = (struct refmatch *)cb_data;
60 if (!strcmp(refname, info->req_ref)) 60 if (!strcmp(refname, info->req_ref))
61 info->match = 1; 61 info->match = 1;
62 if (!info->first_ref) 62 if (!info->first_ref)
63 info->first_ref = xstrdup(refname); 63 info->first_ref = xstrdup(refname);
64 return info->match; 64 return info->match;
65} 65}
66 66
67char *find_default_branch(struct repoinfo *repo) 67char *find_default_branch(struct cgit_repo *repo)
68{ 68{
69 struct refmatch info; 69 struct refmatch info;
70 70
71 info.req_ref = repo->defbranch; 71 info.req_ref = repo->defbranch;
72 info.first_ref = NULL; 72 info.first_ref = NULL;
73 info.match = 0; 73 info.match = 0;
74 for_each_branch_ref(find_current_ref, &info); 74 for_each_branch_ref(find_current_ref, &info);
75 if (info.match) 75 if (info.match)
76 return info.req_ref; 76 return info.req_ref;
77 else 77 else
78 return info.first_ref; 78 return info.first_ref;
79} 79}
80 80
81static void cgit_print_repo_page(struct cacheitem *item) 81static void cgit_print_repo_page(struct cacheitem *item)
82{ 82{
83 char *title, *tmp; 83 char *title, *tmp;
84 int show_search; 84 int show_search;
85 unsigned char sha1[20]; 85 unsigned char sha1[20];
86 86
87 if (chdir(cgit_repo->path)) { 87 if (chdir(ctx.repo->path)) {
88 title = fmt("%s - %s", ctx.cfg.root_title, "Bad request"); 88 title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
89 cgit_print_docstart(title, item); 89 cgit_print_docstart(title, item);
90 cgit_print_pageheader(title, 0); 90 cgit_print_pageheader(title, 0);
91 cgit_print_error(fmt("Unable to scan repository: %s", 91 cgit_print_error(fmt("Unable to scan repository: %s",
92 strerror(errno))); 92 strerror(errno)));
93 cgit_print_docend(); 93 cgit_print_docend();
94 return; 94 return;
95 } 95 }
96 96
97 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); 97 title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
98 show_search = 0; 98 show_search = 0;
99 setenv("GIT_DIR", cgit_repo->path, 1); 99 setenv("GIT_DIR", ctx.repo->path, 1);
100 100
101 if (!ctx.qry.head) { 101 if (!ctx.qry.head) {
102 ctx.qry.head = xstrdup(find_default_branch(cgit_repo)); 102 ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
103 cgit_repo->defbranch = ctx.qry.head; 103 ctx.repo->defbranch = ctx.qry.head;
104 } 104 }
105 105
106 if (!ctx.qry.head) { 106 if (!ctx.qry.head) {
107 cgit_print_docstart(title, item); 107 cgit_print_docstart(title, item);
108 cgit_print_pageheader(title, 0); 108 cgit_print_pageheader(title, 0);
109 cgit_print_error("Repository seems to be empty"); 109 cgit_print_error("Repository seems to be empty");
110 cgit_print_docend(); 110 cgit_print_docend();
111 return; 111 return;
112 } 112 }
113 113
114 if (get_sha1(ctx.qry.head, sha1)) { 114 if (get_sha1(ctx.qry.head, sha1)) {
115 tmp = xstrdup(ctx.qry.head); 115 tmp = xstrdup(ctx.qry.head);
116 ctx.qry.head = cgit_repo->defbranch; 116 ctx.qry.head = ctx.repo->defbranch;
117 cgit_print_docstart(title, item); 117 cgit_print_docstart(title, item);
118 cgit_print_pageheader(title, 0); 118 cgit_print_pageheader(title, 0);
119 cgit_print_error(fmt("Invalid branch: %s", tmp)); 119 cgit_print_error(fmt("Invalid branch: %s", tmp));
120 cgit_print_docend(); 120 cgit_print_docend();
121 return; 121 return;
122 } 122 }
123 123
124 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { 124 if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) {
125 cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1, 125 cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
126 cgit_repobasename(cgit_repo->url), 126 cgit_repobasename(ctx.repo->url),
127 ctx.qry.path, 127 ctx.qry.path,
128 cgit_repo->snapshots ); 128 ctx.repo->snapshots );
129 return; 129 return;
130 } 130 }
131 131
132 if (cgit_cmd == CMD_PATCH) { 132 if (cgit_cmd == CMD_PATCH) {
133 cgit_print_patch(ctx.qry.sha1, item); 133 cgit_print_patch(ctx.qry.sha1, item);
134 return; 134 return;
135 } 135 }
136 136
137 if (cgit_cmd == CMD_BLOB) { 137 if (cgit_cmd == CMD_BLOB) {
138 cgit_print_blob(item, ctx.qry.sha1, ctx.qry.path); 138 cgit_print_blob(item, ctx.qry.sha1, ctx.qry.path);
139 return; 139 return;
140 } 140 }
141 141
142 show_search = (cgit_cmd == CMD_LOG); 142 show_search = (cgit_cmd == CMD_LOG);
143 cgit_print_docstart(title, item); 143 cgit_print_docstart(title, item);
144 if (!cgit_cmd) { 144 if (!cgit_cmd) {
145 cgit_print_pageheader("summary", show_search); 145 cgit_print_pageheader("summary", show_search);
146 cgit_print_summary(); 146 cgit_print_summary();
147 cgit_print_docend(); 147 cgit_print_docend();
148 return; 148 return;
149 } 149 }
150 150
151 cgit_print_pageheader(ctx.qry.page, show_search); 151 cgit_print_pageheader(ctx.qry.page, show_search);
152 152
153 switch(cgit_cmd) { 153 switch(cgit_cmd) {
154 case CMD_LOG: 154 case CMD_LOG:
155 cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, 155 cgit_print_log(ctx.qry.sha1, ctx.qry.ofs,
156 ctx.cfg.max_commit_count, ctx.qry.grep, ctx.qry.search, 156 ctx.cfg.max_commit_count, ctx.qry.grep, ctx.qry.search,
157 ctx.qry.path, 1); 157 ctx.qry.path, 1);
158 break; 158 break;
159 case CMD_TREE: 159 case CMD_TREE:
160 cgit_print_tree(ctx.qry.sha1, ctx.qry.path); 160 cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
161 break; 161 break;
162 case CMD_COMMIT: 162 case CMD_COMMIT:
163 cgit_print_commit(ctx.qry.sha1); 163 cgit_print_commit(ctx.qry.sha1);
164 break; 164 break;
165 case CMD_REFS: 165 case CMD_REFS:
166 cgit_print_refs(); 166 cgit_print_refs();
167 break; 167 break;
168 case CMD_TAG: 168 case CMD_TAG:
169 cgit_print_tag(ctx.qry.sha1); 169 cgit_print_tag(ctx.qry.sha1);
170 break; 170 break;
171 case CMD_DIFF: 171 case CMD_DIFF:
172 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path); 172 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
173 break; 173 break;
174 default: 174 default:
175 cgit_print_error("Invalid request"); 175 cgit_print_error("Invalid request");
176 } 176 }
177 cgit_print_docend(); 177 cgit_print_docend();
178} 178}
179 179
180static void cgit_fill_cache(struct cacheitem *item, int use_cache) 180static void cgit_fill_cache(struct cacheitem *item, int use_cache)
181{ 181{
182 static char buf[PATH_MAX]; 182 static char buf[PATH_MAX];
183 int stdout2; 183 int stdout2;
184 184
185 getcwd(buf, sizeof(buf)); 185 getcwd(buf, sizeof(buf));
186 item->st.st_mtime = time(NULL); 186 item->st.st_mtime = time(NULL);
187 187
188 if (use_cache) { 188 if (use_cache) {
189 stdout2 = chk_positive(dup(STDOUT_FILENO), 189 stdout2 = chk_positive(dup(STDOUT_FILENO),
190 "Preserving STDOUT"); 190 "Preserving STDOUT");
191 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 191 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
192 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 192 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
193 } 193 }
194 194
195 if (cgit_repo) 195 if (ctx.repo)
196 cgit_print_repo_page(item); 196 cgit_print_repo_page(item);
197 else 197 else
198 cgit_print_repolist(item); 198 cgit_print_repolist(item);
199 199
200 if (use_cache) { 200 if (use_cache) {
201 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 201 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
202 chk_positive(dup2(stdout2, STDOUT_FILENO), 202 chk_positive(dup2(stdout2, STDOUT_FILENO),
203 "Restoring original STDOUT"); 203 "Restoring original STDOUT");
204 chk_zero(close(stdout2), "Closing temporary STDOUT"); 204 chk_zero(close(stdout2), "Closing temporary STDOUT");
205 } 205 }
206 206
207 chdir(buf); 207 chdir(buf);
208} 208}
209 209
210static void cgit_check_cache(struct cacheitem *item) 210static void cgit_check_cache(struct cacheitem *item)
211{ 211{
212 int i = 0; 212 int i = 0;
213 213
214 top: 214 top:
215 if (++i > ctx.cfg.max_lock_attempts) { 215 if (++i > ctx.cfg.max_lock_attempts) {
216 die("cgit_refresh_cache: unable to lock %s: %s", 216 die("cgit_refresh_cache: unable to lock %s: %s",
217 item->name, strerror(errno)); 217 item->name, strerror(errno));
218 } 218 }
219 if (!cache_exist(item)) { 219 if (!cache_exist(item)) {
220 if (!cache_lock(item)) { 220 if (!cache_lock(item)) {
221 sleep(1); 221 sleep(1);
222 goto top; 222 goto top;
223 } 223 }
224 if (!cache_exist(item)) { 224 if (!cache_exist(item)) {
225 cgit_fill_cache(item, 1); 225 cgit_fill_cache(item, 1);
226 cache_unlock(item); 226 cache_unlock(item);
227 } else { 227 } else {
228 cache_cancel_lock(item); 228 cache_cancel_lock(item);
229 } 229 }
230 } else if (cache_expired(item) && cache_lock(item)) { 230 } else if (cache_expired(item) && cache_lock(item)) {
231 if (cache_expired(item)) { 231 if (cache_expired(item)) {
232 cgit_fill_cache(item, 1); 232 cgit_fill_cache(item, 1);
233 cache_unlock(item); 233 cache_unlock(item);
234 } else { 234 } else {
235 cache_cancel_lock(item); 235 cache_cancel_lock(item);
236 } 236 }
237 } 237 }
238} 238}
239 239
240static void cgit_print_cache(struct cacheitem *item) 240static void cgit_print_cache(struct cacheitem *item)
241{ 241{
242 static char buf[4096]; 242 static char buf[4096];
243 ssize_t i; 243 ssize_t i;
244 244
245 int fd = open(item->name, O_RDONLY); 245 int fd = open(item->name, O_RDONLY);
246 if (fd<0) 246 if (fd<0)
247 die("Unable to open cached file %s", item->name); 247 die("Unable to open cached file %s", item->name);
248 248
249 while((i=read(fd, buf, sizeof(buf))) > 0) 249 while((i=read(fd, buf, sizeof(buf))) > 0)
250 write(STDOUT_FILENO, buf, i); 250 write(STDOUT_FILENO, buf, i);
251 251
252 close(fd); 252 close(fd);
253} 253}
254 254
255static void cgit_parse_args(int argc, const char **argv) 255static void cgit_parse_args(int argc, const char **argv)
256{ 256{
257 int i; 257 int i;
258 258
259 for (i = 1; i < argc; i++) { 259 for (i = 1; i < argc; i++) {
260 if (!strncmp(argv[i], "--cache=", 8)) { 260 if (!strncmp(argv[i], "--cache=", 8)) {
261 ctx.cfg.cache_root = xstrdup(argv[i]+8); 261 ctx.cfg.cache_root = xstrdup(argv[i]+8);
262 } 262 }
263 if (!strcmp(argv[i], "--nocache")) { 263 if (!strcmp(argv[i], "--nocache")) {
264 ctx.cfg.nocache = 1; 264 ctx.cfg.nocache = 1;
265 } 265 }
266 if (!strncmp(argv[i], "--query=", 8)) { 266 if (!strncmp(argv[i], "--query=", 8)) {
267 ctx.qry.raw = xstrdup(argv[i]+8); 267 ctx.qry.raw = xstrdup(argv[i]+8);
268 } 268 }
269 if (!strncmp(argv[i], "--repo=", 7)) { 269 if (!strncmp(argv[i], "--repo=", 7)) {
270 ctx.qry.repo = xstrdup(argv[i]+7); 270 ctx.qry.repo = xstrdup(argv[i]+7);
271 } 271 }
272 if (!strncmp(argv[i], "--page=", 7)) { 272 if (!strncmp(argv[i], "--page=", 7)) {
273 ctx.qry.page = xstrdup(argv[i]+7); 273 ctx.qry.page = xstrdup(argv[i]+7);
274 } 274 }
275 if (!strncmp(argv[i], "--head=", 7)) { 275 if (!strncmp(argv[i], "--head=", 7)) {
276 ctx.qry.head = xstrdup(argv[i]+7); 276 ctx.qry.head = xstrdup(argv[i]+7);
277 ctx.qry.has_symref = 1; 277 ctx.qry.has_symref = 1;
278 } 278 }
279 if (!strncmp(argv[i], "--sha1=", 7)) { 279 if (!strncmp(argv[i], "--sha1=", 7)) {
280 ctx.qry.sha1 = xstrdup(argv[i]+7); 280 ctx.qry.sha1 = xstrdup(argv[i]+7);
281 ctx.qry.has_sha1 = 1; 281 ctx.qry.has_sha1 = 1;
282 } 282 }
283 if (!strncmp(argv[i], "--ofs=", 6)) { 283 if (!strncmp(argv[i], "--ofs=", 6)) {
284 ctx.qry.ofs = atoi(argv[i]+6); 284 ctx.qry.ofs = atoi(argv[i]+6);
285 } 285 }
286 } 286 }
287} 287}
288 288
289int main(int argc, const char **argv) 289int main(int argc, const char **argv)
290{ 290{
291 struct cacheitem item; 291 struct cacheitem item;
292 const char *cgit_config_env = getenv("CGIT_CONFIG"); 292 const char *cgit_config_env = getenv("CGIT_CONFIG");
293 293
294 cgit_prepare_context(&ctx); 294 cgit_prepare_context(&ctx);
295 htmlfd = STDOUT_FILENO; 295 htmlfd = STDOUT_FILENO;
296 item.st.st_mtime = time(NULL); 296 item.st.st_mtime = time(NULL);
297 cgit_repolist.length = 0; 297 cgit_repolist.length = 0;
298 cgit_repolist.count = 0; 298 cgit_repolist.count = 0;
299 cgit_repolist.repos = NULL; 299 cgit_repolist.repos = NULL;
300 300
301 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 301 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
302 cgit_global_config_cb); 302 cgit_global_config_cb);
303 cgit_repo = NULL;
304 if (getenv("SCRIPT_NAME")) 303 if (getenv("SCRIPT_NAME"))
305 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 304 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
306 if (getenv("QUERY_STRING")) 305 if (getenv("QUERY_STRING"))
307 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 306 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
308 cgit_parse_args(argc, argv); 307 cgit_parse_args(argc, argv);
309 cgit_parse_query(ctx.qry.raw, cgit_querystring_cb); 308 cgit_parse_query(ctx.qry.raw, cgit_querystring_cb);
310 if (!cgit_prepare_cache(&item)) 309 if (!cgit_prepare_cache(&item))
311 return 0; 310 return 0;
312 if (ctx.cfg.nocache) { 311 if (ctx.cfg.nocache) {
313 cgit_fill_cache(&item, 0); 312 cgit_fill_cache(&item, 0);
314 } else { 313 } else {
315 cgit_check_cache(&item); 314 cgit_check_cache(&item);
316 cgit_print_cache(&item); 315 cgit_print_cache(&item);
317 } 316 }
318 return 0; 317 return 0;
319} 318}
diff --git a/cgit.h b/cgit.h
index 0338ebd..598d8c3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,289 +1,289 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <xdiff/xdiff.h> 18#include <xdiff/xdiff.h>
19#include <utf8.h> 19#include <utf8.h>
20 20
21 21
22/* 22/*
23 * The valid cgit repo-commands 23 * The valid cgit repo-commands
24 */ 24 */
25#define CMD_LOG 1 25#define CMD_LOG 1
26#define CMD_COMMIT 2 26#define CMD_COMMIT 2
27#define CMD_DIFF 3 27#define CMD_DIFF 3
28#define CMD_TREE 4 28#define CMD_TREE 4
29#define CMD_BLOB 5 29#define CMD_BLOB 5
30#define CMD_SNAPSHOT 6 30#define CMD_SNAPSHOT 6
31#define CMD_TAG 7 31#define CMD_TAG 7
32#define CMD_REFS 8 32#define CMD_REFS 8
33#define CMD_PATCH 9 33#define CMD_PATCH 9
34 34
35/* 35/*
36 * Dateformats used on misc. pages 36 * Dateformats used on misc. pages
37 */ 37 */
38#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" 38#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
39#define FMT_SHORTDATE "%Y-%m-%d" 39#define FMT_SHORTDATE "%Y-%m-%d"
40 40
41 41
42/* 42/*
43 * Limits used for relative dates 43 * Limits used for relative dates
44 */ 44 */
45#define TM_MIN 60 45#define TM_MIN 60
46#define TM_HOUR (TM_MIN * 60) 46#define TM_HOUR (TM_MIN * 60)
47#define TM_DAY (TM_HOUR * 24) 47#define TM_DAY (TM_HOUR * 24)
48#define TM_WEEK (TM_DAY * 7) 48#define TM_WEEK (TM_DAY * 7)
49#define TM_YEAR (TM_DAY * 365) 49#define TM_YEAR (TM_DAY * 365)
50#define TM_MONTH (TM_YEAR / 12.0) 50#define TM_MONTH (TM_YEAR / 12.0)
51 51
52 52
53/* 53/*
54 * Default encoding 54 * Default encoding
55 */ 55 */
56#define PAGE_ENCODING "UTF-8" 56#define PAGE_ENCODING "UTF-8"
57 57
58typedef void (*configfn)(const char *name, const char *value); 58typedef void (*configfn)(const char *name, const char *value);
59typedef void (*filepair_fn)(struct diff_filepair *pair); 59typedef void (*filepair_fn)(struct diff_filepair *pair);
60typedef void (*linediff_fn)(char *line, int len); 60typedef void (*linediff_fn)(char *line, int len);
61 61
62struct cacheitem { 62struct cacheitem {
63 char *name; 63 char *name;
64 struct stat st; 64 struct stat st;
65 int ttl; 65 int ttl;
66 int fd; 66 int fd;
67}; 67};
68 68
69struct repoinfo { 69struct cgit_repo {
70 char *url; 70 char *url;
71 char *name; 71 char *name;
72 char *path; 72 char *path;
73 char *desc; 73 char *desc;
74 char *owner; 74 char *owner;
75 char *defbranch; 75 char *defbranch;
76 char *group; 76 char *group;
77 char *module_link; 77 char *module_link;
78 char *readme; 78 char *readme;
79 char *clone_url; 79 char *clone_url;
80 int snapshots; 80 int snapshots;
81 int enable_log_filecount; 81 int enable_log_filecount;
82 int enable_log_linecount; 82 int enable_log_linecount;
83}; 83};
84 84
85struct repolist { 85struct cgit_repolist {
86 int length; 86 int length;
87 int count; 87 int count;
88 struct repoinfo *repos; 88 struct cgit_repo *repos;
89}; 89};
90 90
91struct commitinfo { 91struct commitinfo {
92 struct commit *commit; 92 struct commit *commit;
93 char *author; 93 char *author;
94 char *author_email; 94 char *author_email;
95 unsigned long author_date; 95 unsigned long author_date;
96 char *committer; 96 char *committer;
97 char *committer_email; 97 char *committer_email;
98 unsigned long committer_date; 98 unsigned long committer_date;
99 char *subject; 99 char *subject;
100 char *msg; 100 char *msg;
101 char *msg_encoding; 101 char *msg_encoding;
102}; 102};
103 103
104struct taginfo { 104struct taginfo {
105 char *tagger; 105 char *tagger;
106 char *tagger_email; 106 char *tagger_email;
107 int tagger_date; 107 int tagger_date;
108 char *msg; 108 char *msg;
109}; 109};
110 110
111struct refinfo { 111struct refinfo {
112 const char *refname; 112 const char *refname;
113 struct object *object; 113 struct object *object;
114 union { 114 union {
115 struct taginfo *tag; 115 struct taginfo *tag;
116 struct commitinfo *commit; 116 struct commitinfo *commit;
117 }; 117 };
118}; 118};
119 119
120struct reflist { 120struct reflist {
121 struct refinfo **refs; 121 struct refinfo **refs;
122 int alloc; 122 int alloc;
123 int count; 123 int count;
124}; 124};
125 125
126struct cgit_query { 126struct cgit_query {
127 int has_symref; 127 int has_symref;
128 int has_sha1; 128 int has_sha1;
129 char *raw; 129 char *raw;
130 char *repo; 130 char *repo;
131 char *page; 131 char *page;
132 char *search; 132 char *search;
133 char *grep; 133 char *grep;
134 char *head; 134 char *head;
135 char *sha1; 135 char *sha1;
136 char *sha2; 136 char *sha2;
137 char *path; 137 char *path;
138 char *name; 138 char *name;
139 int ofs; 139 int ofs;
140}; 140};
141 141
142struct cgit_config { 142struct cgit_config {
143 char *agefile; 143 char *agefile;
144 char *cache_root; 144 char *cache_root;
145 char *clone_prefix; 145 char *clone_prefix;
146 char *css; 146 char *css;
147 char *index_header; 147 char *index_header;
148 char *index_info; 148 char *index_info;
149 char *logo; 149 char *logo;
150 char *logo_link; 150 char *logo_link;
151 char *module_link; 151 char *module_link;
152 char *repo_group; 152 char *repo_group;
153 char *robots; 153 char *robots;
154 char *root_title; 154 char *root_title;
155 char *script_name; 155 char *script_name;
156 char *virtual_root; 156 char *virtual_root;
157 int cache_dynamic_ttl; 157 int cache_dynamic_ttl;
158 int cache_max_create_time; 158 int cache_max_create_time;
159 int cache_repo_ttl; 159 int cache_repo_ttl;
160 int cache_root_ttl; 160 int cache_root_ttl;
161 int cache_static_ttl; 161 int cache_static_ttl;
162 int enable_index_links; 162 int enable_index_links;
163 int enable_log_filecount; 163 int enable_log_filecount;
164 int enable_log_linecount; 164 int enable_log_linecount;
165 int max_commit_count; 165 int max_commit_count;
166 int max_lock_attempts; 166 int max_lock_attempts;
167 int max_msg_len; 167 int max_msg_len;
168 int max_repodesc_len; 168 int max_repodesc_len;
169 int nocache; 169 int nocache;
170 int renamelimit; 170 int renamelimit;
171 int snapshots; 171 int snapshots;
172 int summary_branches; 172 int summary_branches;
173 int summary_log; 173 int summary_log;
174 int summary_tags; 174 int summary_tags;
175}; 175};
176 176
177struct cgit_context { 177struct cgit_context {
178 struct cgit_query qry; 178 struct cgit_query qry;
179 struct cgit_config cfg; 179 struct cgit_config cfg;
180 struct cgit_repo *repo;
180}; 181};
181 182
182extern const char *cgit_version; 183extern const char *cgit_version;
183 184
184extern struct repolist cgit_repolist; 185extern struct cgit_repolist cgit_repolist;
185extern struct repoinfo *cgit_repo;
186extern struct cgit_context ctx; 186extern struct cgit_context ctx;
187extern int cgit_cmd; 187extern int cgit_cmd;
188 188
189extern int htmlfd; 189extern int htmlfd;
190 190
191extern void cgit_prepare_context(struct cgit_context *ctx); 191extern void cgit_prepare_context(struct cgit_context *ctx);
192extern int cgit_get_cmd_index(const char *cmd); 192extern int cgit_get_cmd_index(const char *cmd);
193extern struct repoinfo *cgit_get_repoinfo(const char *url); 193extern struct cgit_repo *cgit_get_repoinfo(const char *url);
194extern void cgit_global_config_cb(const char *name, const char *value); 194extern void cgit_global_config_cb(const char *name, const char *value);
195extern void cgit_repo_config_cb(const char *name, const char *value); 195extern void cgit_repo_config_cb(const char *name, const char *value);
196extern void cgit_querystring_cb(const char *name, const char *value); 196extern void cgit_querystring_cb(const char *name, const char *value);
197 197
198extern int chk_zero(int result, char *msg); 198extern int chk_zero(int result, char *msg);
199extern int chk_positive(int result, char *msg); 199extern int chk_positive(int result, char *msg);
200extern int chk_non_negative(int result, char *msg); 200extern int chk_non_negative(int result, char *msg);
201 201
202extern int hextoint(char c); 202extern int hextoint(char c);
203extern char *trim_end(const char *str, char c); 203extern char *trim_end(const char *str, char c);
204extern char *strlpart(char *txt, int maxlen); 204extern char *strlpart(char *txt, int maxlen);
205extern char *strrpart(char *txt, int maxlen); 205extern char *strrpart(char *txt, int maxlen);
206 206
207extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 207extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
208extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 208extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
209 int flags, void *cb_data); 209 int flags, void *cb_data);
210 210
211extern void *cgit_free_commitinfo(struct commitinfo *info); 211extern void *cgit_free_commitinfo(struct commitinfo *info);
212 212
213extern int cgit_diff_files(const unsigned char *old_sha1, 213extern int cgit_diff_files(const unsigned char *old_sha1,
214 const unsigned char *new_sha1, 214 const unsigned char *new_sha1,
215 linediff_fn fn); 215 linediff_fn fn);
216 216
217extern void cgit_diff_tree(const unsigned char *old_sha1, 217extern void cgit_diff_tree(const unsigned char *old_sha1,
218 const unsigned char *new_sha1, 218 const unsigned char *new_sha1,
219 filepair_fn fn, const char *prefix); 219 filepair_fn fn, const char *prefix);
220 220
221extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 221extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
222 222
223extern char *fmt(const char *format,...); 223extern char *fmt(const char *format,...);
224 224
225extern void html(const char *txt); 225extern void html(const char *txt);
226extern void htmlf(const char *format,...); 226extern void htmlf(const char *format,...);
227extern void html_txt(char *txt); 227extern void html_txt(char *txt);
228extern void html_ntxt(int len, char *txt); 228extern void html_ntxt(int len, char *txt);
229extern void html_attr(char *txt); 229extern void html_attr(char *txt);
230extern void html_hidden(char *name, char *value); 230extern void html_hidden(char *name, char *value);
231extern void html_option(char *value, char *text, char *selected_value); 231extern void html_option(char *value, char *text, char *selected_value);
232extern void html_link_open(char *url, char *title, char *class); 232extern void html_link_open(char *url, char *title, char *class);
233extern void html_link_close(void); 233extern void html_link_close(void);
234extern void html_filemode(unsigned short mode); 234extern void html_filemode(unsigned short mode);
235extern int html_include(const char *filename); 235extern int html_include(const char *filename);
236 236
237extern int cgit_read_config(const char *filename, configfn fn); 237extern int cgit_read_config(const char *filename, configfn fn);
238extern int cgit_parse_query(char *txt, configfn fn); 238extern int cgit_parse_query(char *txt, configfn fn);
239extern struct commitinfo *cgit_parse_commit(struct commit *commit); 239extern struct commitinfo *cgit_parse_commit(struct commit *commit);
240extern struct taginfo *cgit_parse_tag(struct tag *tag); 240extern struct taginfo *cgit_parse_tag(struct tag *tag);
241extern void cgit_parse_url(const char *url); 241extern void cgit_parse_url(const char *url);
242 242
243extern char *cache_safe_filename(const char *unsafe); 243extern char *cache_safe_filename(const char *unsafe);
244extern int cache_lock(struct cacheitem *item); 244extern int cache_lock(struct cacheitem *item);
245extern int cache_unlock(struct cacheitem *item); 245extern int cache_unlock(struct cacheitem *item);
246extern int cache_cancel_lock(struct cacheitem *item); 246extern int cache_cancel_lock(struct cacheitem *item);
247extern int cache_exist(struct cacheitem *item); 247extern int cache_exist(struct cacheitem *item);
248extern int cache_expired(struct cacheitem *item); 248extern int cache_expired(struct cacheitem *item);
249 249
250extern char *cgit_repourl(const char *reponame); 250extern char *cgit_repourl(const char *reponame);
251extern char *cgit_fileurl(const char *reponame, const char *pagename, 251extern char *cgit_fileurl(const char *reponame, const char *pagename,
252 const char *filename, const char *query); 252 const char *filename, const char *query);
253extern char *cgit_pageurl(const char *reponame, const char *pagename, 253extern char *cgit_pageurl(const char *reponame, const char *pagename,
254 const char *query); 254 const char *query);
255 255
256extern const char *cgit_repobasename(const char *reponame); 256extern const char *cgit_repobasename(const char *reponame);
257 257
258extern void cgit_tree_link(char *name, char *title, char *class, char *head, 258extern void cgit_tree_link(char *name, char *title, char *class, char *head,
259 char *rev, char *path); 259 char *rev, char *path);
260extern void cgit_log_link(char *name, char *title, char *class, char *head, 260extern void cgit_log_link(char *name, char *title, char *class, char *head,
261 char *rev, char *path, int ofs, char *grep, 261 char *rev, char *path, int ofs, char *grep,
262 char *pattern); 262 char *pattern);
263extern void cgit_commit_link(char *name, char *title, char *class, char *head, 263extern void cgit_commit_link(char *name, char *title, char *class, char *head,
264 char *rev); 264 char *rev);
265extern void cgit_refs_link(char *name, char *title, char *class, char *head, 265extern void cgit_refs_link(char *name, char *title, char *class, char *head,
266 char *rev, char *path); 266 char *rev, char *path);
267extern void cgit_snapshot_link(char *name, char *title, char *class, 267extern void cgit_snapshot_link(char *name, char *title, char *class,
268 char *head, char *rev, char *archivename); 268 char *head, char *rev, char *archivename);
269extern void cgit_diff_link(char *name, char *title, char *class, char *head, 269extern void cgit_diff_link(char *name, char *title, char *class, char *head,
270 char *new_rev, char *old_rev, char *path); 270 char *new_rev, char *old_rev, char *path);
271 271
272extern void cgit_object_link(struct object *obj); 272extern void cgit_object_link(struct object *obj);
273 273
274extern void cgit_print_error(char *msg); 274extern void cgit_print_error(char *msg);
275extern void cgit_print_date(time_t secs, char *format); 275extern void cgit_print_date(time_t secs, char *format);
276extern void cgit_print_age(time_t t, time_t max_relative, char *format); 276extern void cgit_print_age(time_t t, time_t max_relative, char *format);
277extern void cgit_print_docstart(char *title, struct cacheitem *item); 277extern void cgit_print_docstart(char *title, struct cacheitem *item);
278extern void cgit_print_docend(); 278extern void cgit_print_docend();
279extern void cgit_print_pageheader(char *title, int show_search); 279extern void cgit_print_pageheader(char *title, int show_search);
280extern void cgit_print_snapshot_start(const char *mimetype, 280extern void cgit_print_snapshot_start(const char *mimetype,
281 const char *filename, 281 const char *filename,
282 struct cacheitem *item); 282 struct cacheitem *item);
283extern void cgit_print_branches(int maxcount); 283extern void cgit_print_branches(int maxcount);
284extern void cgit_print_tags(int maxcount); 284extern void cgit_print_tags(int maxcount);
285 285
286extern void cgit_print_repolist(struct cacheitem *item); 286extern void cgit_print_repolist(struct cacheitem *item);
287extern void cgit_print_summary(); 287extern void cgit_print_summary();
288extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 288extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
289 char *pattern, char *path, int pager); 289 char *pattern, char *path, int pager);
diff --git a/parsing.c b/parsing.c
index 8cf56a4..027f06b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -50,213 +50,213 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
50 i = 0; 50 i = 0;
51 continue; 51 continue;
52 } else if (c=='\n' || c==EOF) { 52 } else if (c=='\n' || c==EOF) {
53 line[i] = 0; 53 line[i] = 0;
54 break; 54 break;
55 } else { 55 } else {
56 line[i]=c; 56 line[i]=c;
57 } 57 }
58 isname = 1; 58 isname = 1;
59 i++; 59 i++;
60 } 60 }
61 line[i+1] = 0; 61 line[i+1] = 0;
62 return i; 62 return i;
63} 63}
64 64
65int cgit_read_config(const char *filename, configfn fn) 65int cgit_read_config(const char *filename, configfn fn)
66{ 66{
67 static int nesting; 67 static int nesting;
68 int len; 68 int len;
69 char line[256]; 69 char line[256];
70 const char *value; 70 const char *value;
71 FILE *f; 71 FILE *f;
72 72
73 /* cancel deeply nested include-commands */ 73 /* cancel deeply nested include-commands */
74 if (nesting > 8) 74 if (nesting > 8)
75 return -1; 75 return -1;
76 if (!(f = fopen(filename, "r"))) 76 if (!(f = fopen(filename, "r")))
77 return -1; 77 return -1;
78 nesting++; 78 nesting++;
79 while((len = read_config_line(f, line, &value, sizeof(line))) > 0) 79 while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
80 (*fn)(line, value); 80 (*fn)(line, value);
81 nesting--; 81 nesting--;
82 fclose(f); 82 fclose(f);
83 return 0; 83 return 0;
84} 84}
85 85
86char *convert_query_hexchar(char *txt) 86char *convert_query_hexchar(char *txt)
87{ 87{
88 int d1, d2; 88 int d1, d2;
89 if (strlen(txt) < 3) { 89 if (strlen(txt) < 3) {
90 *txt = '\0'; 90 *txt = '\0';
91 return txt-1; 91 return txt-1;
92 } 92 }
93 d1 = hextoint(*(txt+1)); 93 d1 = hextoint(*(txt+1));
94 d2 = hextoint(*(txt+2)); 94 d2 = hextoint(*(txt+2));
95 if (d1<0 || d2<0) { 95 if (d1<0 || d2<0) {
96 strcpy(txt, txt+3); 96 strcpy(txt, txt+3);
97 return txt-1; 97 return txt-1;
98 } else { 98 } else {
99 *txt = d1 * 16 + d2; 99 *txt = d1 * 16 + d2;
100 strcpy(txt+1, txt+3); 100 strcpy(txt+1, txt+3);
101 return txt; 101 return txt;
102 } 102 }
103} 103}
104 104
105int cgit_parse_query(char *txt, configfn fn) 105int cgit_parse_query(char *txt, configfn fn)
106{ 106{
107 char *t, *value = NULL, c; 107 char *t, *value = NULL, c;
108 108
109 if (!txt) 109 if (!txt)
110 return 0; 110 return 0;
111 111
112 t = txt = xstrdup(txt); 112 t = txt = xstrdup(txt);
113 113
114 while((c=*t) != '\0') { 114 while((c=*t) != '\0') {
115 if (c=='=') { 115 if (c=='=') {
116 *t = '\0'; 116 *t = '\0';
117 value = t+1; 117 value = t+1;
118 } else if (c=='+') { 118 } else if (c=='+') {
119 *t = ' '; 119 *t = ' ';
120 } else if (c=='%') { 120 } else if (c=='%') {
121 t = convert_query_hexchar(t); 121 t = convert_query_hexchar(t);
122 } else if (c=='&') { 122 } else if (c=='&') {
123 *t = '\0'; 123 *t = '\0';
124 (*fn)(txt, value); 124 (*fn)(txt, value);
125 txt = t+1; 125 txt = t+1;
126 value = NULL; 126 value = NULL;
127 } 127 }
128 t++; 128 t++;
129 } 129 }
130 if (t!=txt) 130 if (t!=txt)
131 (*fn)(txt, value); 131 (*fn)(txt, value);
132 return 0; 132 return 0;
133} 133}
134 134
135/* 135/*
136 * url syntax: [repo ['/' cmd [ '/' path]]] 136 * url syntax: [repo ['/' cmd [ '/' path]]]
137 * repo: any valid repo url, may contain '/' 137 * repo: any valid repo url, may contain '/'
138 * cmd: log | commit | diff | tree | view | blob | snapshot 138 * cmd: log | commit | diff | tree | view | blob | snapshot
139 * path: any valid path, may contain '/' 139 * path: any valid path, may contain '/'
140 * 140 *
141 */ 141 */
142void cgit_parse_url(const char *url) 142void cgit_parse_url(const char *url)
143{ 143{
144 char *cmd, *p; 144 char *cmd, *p;
145 145
146 cgit_repo = NULL; 146 ctx.repo = NULL;
147 if (!url || url[0] == '\0') 147 if (!url || url[0] == '\0')
148 return; 148 return;
149 149
150 cgit_repo = cgit_get_repoinfo(url); 150 ctx.repo = cgit_get_repoinfo(url);
151 if (cgit_repo) { 151 if (ctx.repo) {
152 ctx.qry.repo = cgit_repo->url; 152 ctx.qry.repo = ctx.repo->url;
153 return; 153 return;
154 } 154 }
155 155
156 cmd = strchr(url, '/'); 156 cmd = strchr(url, '/');
157 while (!cgit_repo && cmd) { 157 while (!ctx.repo && cmd) {
158 cmd[0] = '\0'; 158 cmd[0] = '\0';
159 cgit_repo = cgit_get_repoinfo(url); 159 ctx.repo = cgit_get_repoinfo(url);
160 if (cgit_repo == NULL) { 160 if (ctx.repo == NULL) {
161 cmd[0] = '/'; 161 cmd[0] = '/';
162 cmd = strchr(cmd + 1, '/'); 162 cmd = strchr(cmd + 1, '/');
163 continue; 163 continue;
164 } 164 }
165 165
166 ctx.qry.repo = cgit_repo->url; 166 ctx.qry.repo = ctx.repo->url;
167 p = strchr(cmd + 1, '/'); 167 p = strchr(cmd + 1, '/');
168 if (p) { 168 if (p) {
169 p[0] = '\0'; 169 p[0] = '\0';
170 if (p[1]) 170 if (p[1])
171 ctx.qry.path = trim_end(p + 1, '/'); 171 ctx.qry.path = trim_end(p + 1, '/');
172 } 172 }
173 cgit_cmd = cgit_get_cmd_index(cmd + 1); 173 cgit_cmd = cgit_get_cmd_index(cmd + 1);
174 ctx.qry.page = xstrdup(cmd + 1); 174 ctx.qry.page = xstrdup(cmd + 1);
175 return; 175 return;
176 } 176 }
177} 177}
178 178
179char *substr(const char *head, const char *tail) 179char *substr(const char *head, const char *tail)
180{ 180{
181 char *buf; 181 char *buf;
182 182
183 buf = xmalloc(tail - head + 1); 183 buf = xmalloc(tail - head + 1);
184 strncpy(buf, head, tail - head); 184 strncpy(buf, head, tail - head);
185 buf[tail - head] = '\0'; 185 buf[tail - head] = '\0';
186 return buf; 186 return buf;
187} 187}
188 188
189struct commitinfo *cgit_parse_commit(struct commit *commit) 189struct commitinfo *cgit_parse_commit(struct commit *commit)
190{ 190{
191 struct commitinfo *ret; 191 struct commitinfo *ret;
192 char *p = commit->buffer, *t = commit->buffer; 192 char *p = commit->buffer, *t = commit->buffer;
193 193
194 ret = xmalloc(sizeof(*ret)); 194 ret = xmalloc(sizeof(*ret));
195 ret->commit = commit; 195 ret->commit = commit;
196 ret->author = NULL; 196 ret->author = NULL;
197 ret->author_email = NULL; 197 ret->author_email = NULL;
198 ret->committer = NULL; 198 ret->committer = NULL;
199 ret->committer_email = NULL; 199 ret->committer_email = NULL;
200 ret->subject = NULL; 200 ret->subject = NULL;
201 ret->msg = NULL; 201 ret->msg = NULL;
202 ret->msg_encoding = NULL; 202 ret->msg_encoding = NULL;
203 203
204 if (p == NULL) 204 if (p == NULL)
205 return ret; 205 return ret;
206 206
207 if (strncmp(p, "tree ", 5)) 207 if (strncmp(p, "tree ", 5))
208 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 208 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
209 else 209 else
210 p += 46; // "tree " + hex[40] + "\n" 210 p += 46; // "tree " + hex[40] + "\n"
211 211
212 while (!strncmp(p, "parent ", 7)) 212 while (!strncmp(p, "parent ", 7))
213 p += 48; // "parent " + hex[40] + "\n" 213 p += 48; // "parent " + hex[40] + "\n"
214 214
215 if (!strncmp(p, "author ", 7)) { 215 if (!strncmp(p, "author ", 7)) {
216 p += 7; 216 p += 7;
217 t = strchr(p, '<') - 1; 217 t = strchr(p, '<') - 1;
218 ret->author = substr(p, t); 218 ret->author = substr(p, t);
219 p = t; 219 p = t;
220 t = strchr(t, '>') + 1; 220 t = strchr(t, '>') + 1;
221 ret->author_email = substr(p, t); 221 ret->author_email = substr(p, t);
222 ret->author_date = atol(t+1); 222 ret->author_date = atol(t+1);
223 p = strchr(t, '\n') + 1; 223 p = strchr(t, '\n') + 1;
224 } 224 }
225 225
226 if (!strncmp(p, "committer ", 9)) { 226 if (!strncmp(p, "committer ", 9)) {
227 p += 9; 227 p += 9;
228 t = strchr(p, '<') - 1; 228 t = strchr(p, '<') - 1;
229 ret->committer = substr(p, t); 229 ret->committer = substr(p, t);
230 p = t; 230 p = t;
231 t = strchr(t, '>') + 1; 231 t = strchr(t, '>') + 1;
232 ret->committer_email = substr(p, t); 232 ret->committer_email = substr(p, t);
233 ret->committer_date = atol(t+1); 233 ret->committer_date = atol(t+1);
234 p = strchr(t, '\n') + 1; 234 p = strchr(t, '\n') + 1;
235 } 235 }
236 236
237 if (!strncmp(p, "encoding ", 9)) { 237 if (!strncmp(p, "encoding ", 9)) {
238 p += 9; 238 p += 9;
239 t = strchr(p, '\n') + 1; 239 t = strchr(p, '\n') + 1;
240 ret->msg_encoding = substr(p, t); 240 ret->msg_encoding = substr(p, t);
241 p = t; 241 p = t;
242 } else 242 } else
243 ret->msg_encoding = xstrdup(PAGE_ENCODING); 243 ret->msg_encoding = xstrdup(PAGE_ENCODING);
244 244
245 while (*p && (*p != '\n')) 245 while (*p && (*p != '\n'))
246 p = strchr(p, '\n') + 1; // skip unknown header fields 246 p = strchr(p, '\n') + 1; // skip unknown header fields
247 247
248 while (*p == '\n') 248 while (*p == '\n')
249 p = strchr(p, '\n') + 1; 249 p = strchr(p, '\n') + 1;
250 250
251 t = strchr(p, '\n'); 251 t = strchr(p, '\n');
252 if (t) { 252 if (t) {
253 if (*t == '\0') 253 if (*t == '\0')
254 ret->subject = "** empty **"; 254 ret->subject = "** empty **";
255 else 255 else
256 ret->subject = substr(p, t); 256 ret->subject = substr(p, t);
257 p = t + 1; 257 p = t + 1;
258 258
259 while (*p == '\n') 259 while (*p == '\n')
260 p = strchr(p, '\n') + 1; 260 p = strchr(p, '\n') + 1;
261 ret->msg = xstrdup(p); 261 ret->msg = xstrdup(p);
262 } else 262 } else
diff --git a/shared.c b/shared.c
index 8dd2b00..808e674 100644
--- a/shared.c
+++ b/shared.c
@@ -1,312 +1,311 @@
1/* shared.c: global vars + some callback functions 1/* shared.c: global vars + some callback functions
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
11struct repolist cgit_repolist; 11struct cgit_repolist cgit_repolist;
12struct repoinfo *cgit_repo;
13struct cgit_context ctx; 12struct cgit_context ctx;
14int cgit_cmd; 13int cgit_cmd;
15 14
16const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
17 16
18int htmlfd = 0; 17int htmlfd = 0;
19 18
20void cgit_prepare_context(struct cgit_context *ctx) 19void cgit_prepare_context(struct cgit_context *ctx)
21{ 20{
22 memset(ctx, 0, sizeof(ctx)); 21 memset(ctx, 0, sizeof(ctx));
23 ctx->cfg.agefile = "info/web/last-modified"; 22 ctx->cfg.agefile = "info/web/last-modified";
24 ctx->cfg.cache_dynamic_ttl = 5; 23 ctx->cfg.cache_dynamic_ttl = 5;
25 ctx->cfg.cache_max_create_time = 5; 24 ctx->cfg.cache_max_create_time = 5;
26 ctx->cfg.cache_repo_ttl = 5; 25 ctx->cfg.cache_repo_ttl = 5;
27 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 26 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
28 ctx->cfg.cache_root_ttl = 5; 27 ctx->cfg.cache_root_ttl = 5;
29 ctx->cfg.cache_static_ttl = -1; 28 ctx->cfg.cache_static_ttl = -1;
30 ctx->cfg.css = "/cgit.css"; 29 ctx->cfg.css = "/cgit.css";
31 ctx->cfg.logo = "/git-logo.png"; 30 ctx->cfg.logo = "/git-logo.png";
32 ctx->cfg.max_commit_count = 50; 31 ctx->cfg.max_commit_count = 50;
33 ctx->cfg.max_lock_attempts = 5; 32 ctx->cfg.max_lock_attempts = 5;
34 ctx->cfg.max_msg_len = 60; 33 ctx->cfg.max_msg_len = 60;
35 ctx->cfg.max_repodesc_len = 60; 34 ctx->cfg.max_repodesc_len = 60;
36 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 35 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
37 ctx->cfg.renamelimit = -1; 36 ctx->cfg.renamelimit = -1;
38 ctx->cfg.robots = "index, nofollow"; 37 ctx->cfg.robots = "index, nofollow";
39 ctx->cfg.root_title = "Git repository browser"; 38 ctx->cfg.root_title = "Git repository browser";
40 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 39 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
41} 40}
42 41
43int cgit_get_cmd_index(const char *cmd) 42int cgit_get_cmd_index(const char *cmd)
44{ 43{
45 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 44 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
46 "snapshot", "tag", "refs", "patch", NULL}; 45 "snapshot", "tag", "refs", "patch", NULL};
47 int i; 46 int i;
48 47
49 for(i = 0; cmds[i]; i++) 48 for(i = 0; cmds[i]; i++)
50 if (!strcmp(cmd, cmds[i])) 49 if (!strcmp(cmd, cmds[i]))
51 return i + 1; 50 return i + 1;
52 return 0; 51 return 0;
53} 52}
54 53
55int chk_zero(int result, char *msg) 54int chk_zero(int result, char *msg)
56{ 55{
57 if (result != 0) 56 if (result != 0)
58 die("%s: %s", msg, strerror(errno)); 57 die("%s: %s", msg, strerror(errno));
59 return result; 58 return result;
60} 59}
61 60
62int chk_positive(int result, char *msg) 61int chk_positive(int result, char *msg)
63{ 62{
64 if (result <= 0) 63 if (result <= 0)
65 die("%s: %s", msg, strerror(errno)); 64 die("%s: %s", msg, strerror(errno));
66 return result; 65 return result;
67} 66}
68 67
69int chk_non_negative(int result, char *msg) 68int chk_non_negative(int result, char *msg)
70{ 69{
71 if (result < 0) 70 if (result < 0)
72 die("%s: %s",msg, strerror(errno)); 71 die("%s: %s",msg, strerror(errno));
73 return result; 72 return result;
74} 73}
75 74
76struct repoinfo *add_repo(const char *url) 75struct cgit_repo *add_repo(const char *url)
77{ 76{
78 struct repoinfo *ret; 77 struct cgit_repo *ret;
79 78
80 if (++cgit_repolist.count > cgit_repolist.length) { 79 if (++cgit_repolist.count > cgit_repolist.length) {
81 if (cgit_repolist.length == 0) 80 if (cgit_repolist.length == 0)
82 cgit_repolist.length = 8; 81 cgit_repolist.length = 8;
83 else 82 else
84 cgit_repolist.length *= 2; 83 cgit_repolist.length *= 2;
85 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 84 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
86 cgit_repolist.length * 85 cgit_repolist.length *
87 sizeof(struct repoinfo)); 86 sizeof(struct cgit_repo));
88 } 87 }
89 88
90 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 89 ret = &cgit_repolist.repos[cgit_repolist.count-1];
91 ret->url = trim_end(url, '/'); 90 ret->url = trim_end(url, '/');
92 ret->name = ret->url; 91 ret->name = ret->url;
93 ret->path = NULL; 92 ret->path = NULL;
94 ret->desc = "[no description]"; 93 ret->desc = "[no description]";
95 ret->owner = NULL; 94 ret->owner = NULL;
96 ret->group = ctx.cfg.repo_group; 95 ret->group = ctx.cfg.repo_group;
97 ret->defbranch = "master"; 96 ret->defbranch = "master";
98 ret->snapshots = ctx.cfg.snapshots; 97 ret->snapshots = ctx.cfg.snapshots;
99 ret->enable_log_filecount = ctx.cfg.enable_log_filecount; 98 ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
100 ret->enable_log_linecount = ctx.cfg.enable_log_linecount; 99 ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
101 ret->module_link = ctx.cfg.module_link; 100 ret->module_link = ctx.cfg.module_link;
102 ret->readme = NULL; 101 ret->readme = NULL;
103 return ret; 102 return ret;
104} 103}
105 104
106struct repoinfo *cgit_get_repoinfo(const char *url) 105struct cgit_repo *cgit_get_repoinfo(const char *url)
107{ 106{
108 int i; 107 int i;
109 struct repoinfo *repo; 108 struct cgit_repo *repo;
110 109
111 for (i=0; i<cgit_repolist.count; i++) { 110 for (i=0; i<cgit_repolist.count; i++) {
112 repo = &cgit_repolist.repos[i]; 111 repo = &cgit_repolist.repos[i];
113 if (!strcmp(repo->url, url)) 112 if (!strcmp(repo->url, url))
114 return repo; 113 return repo;
115 } 114 }
116 return NULL; 115 return NULL;
117} 116}
118 117
119void cgit_global_config_cb(const char *name, const char *value) 118void cgit_global_config_cb(const char *name, const char *value)
120{ 119{
121 if (!strcmp(name, "root-title")) 120 if (!strcmp(name, "root-title"))
122 ctx.cfg.root_title = xstrdup(value); 121 ctx.cfg.root_title = xstrdup(value);
123 else if (!strcmp(name, "css")) 122 else if (!strcmp(name, "css"))
124 ctx.cfg.css = xstrdup(value); 123 ctx.cfg.css = xstrdup(value);
125 else if (!strcmp(name, "logo")) 124 else if (!strcmp(name, "logo"))
126 ctx.cfg.logo = xstrdup(value); 125 ctx.cfg.logo = xstrdup(value);
127 else if (!strcmp(name, "index-header")) 126 else if (!strcmp(name, "index-header"))
128 ctx.cfg.index_header = xstrdup(value); 127 ctx.cfg.index_header = xstrdup(value);
129 else if (!strcmp(name, "index-info")) 128 else if (!strcmp(name, "index-info"))
130 ctx.cfg.index_info = xstrdup(value); 129 ctx.cfg.index_info = xstrdup(value);
131 else if (!strcmp(name, "logo-link")) 130 else if (!strcmp(name, "logo-link"))
132 ctx.cfg.logo_link = xstrdup(value); 131 ctx.cfg.logo_link = xstrdup(value);
133 else if (!strcmp(name, "module-link")) 132 else if (!strcmp(name, "module-link"))
134 ctx.cfg.module_link = xstrdup(value); 133 ctx.cfg.module_link = xstrdup(value);
135 else if (!strcmp(name, "virtual-root")) { 134 else if (!strcmp(name, "virtual-root")) {
136 ctx.cfg.virtual_root = trim_end(value, '/'); 135 ctx.cfg.virtual_root = trim_end(value, '/');
137 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 136 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
138 ctx.cfg.virtual_root = ""; 137 ctx.cfg.virtual_root = "";
139 } else if (!strcmp(name, "nocache")) 138 } else if (!strcmp(name, "nocache"))
140 ctx.cfg.nocache = atoi(value); 139 ctx.cfg.nocache = atoi(value);
141 else if (!strcmp(name, "snapshots")) 140 else if (!strcmp(name, "snapshots"))
142 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 141 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
143 else if (!strcmp(name, "enable-index-links")) 142 else if (!strcmp(name, "enable-index-links"))
144 ctx.cfg.enable_index_links = atoi(value); 143 ctx.cfg.enable_index_links = atoi(value);
145 else if (!strcmp(name, "enable-log-filecount")) 144 else if (!strcmp(name, "enable-log-filecount"))
146 ctx.cfg.enable_log_filecount = atoi(value); 145 ctx.cfg.enable_log_filecount = atoi(value);
147 else if (!strcmp(name, "enable-log-linecount")) 146 else if (!strcmp(name, "enable-log-linecount"))
148 ctx.cfg.enable_log_linecount = atoi(value); 147 ctx.cfg.enable_log_linecount = atoi(value);
149 else if (!strcmp(name, "cache-root")) 148 else if (!strcmp(name, "cache-root"))
150 ctx.cfg.cache_root = xstrdup(value); 149 ctx.cfg.cache_root = xstrdup(value);
151 else if (!strcmp(name, "cache-root-ttl")) 150 else if (!strcmp(name, "cache-root-ttl"))
152 ctx.cfg.cache_root_ttl = atoi(value); 151 ctx.cfg.cache_root_ttl = atoi(value);
153 else if (!strcmp(name, "cache-repo-ttl")) 152 else if (!strcmp(name, "cache-repo-ttl"))
154 ctx.cfg.cache_repo_ttl = atoi(value); 153 ctx.cfg.cache_repo_ttl = atoi(value);
155 else if (!strcmp(name, "cache-static-ttl")) 154 else if (!strcmp(name, "cache-static-ttl"))
156 ctx.cfg.cache_static_ttl = atoi(value); 155 ctx.cfg.cache_static_ttl = atoi(value);
157 else if (!strcmp(name, "cache-dynamic-ttl")) 156 else if (!strcmp(name, "cache-dynamic-ttl"))
158 ctx.cfg.cache_dynamic_ttl = atoi(value); 157 ctx.cfg.cache_dynamic_ttl = atoi(value);
159 else if (!strcmp(name, "max-message-length")) 158 else if (!strcmp(name, "max-message-length"))
160 ctx.cfg.max_msg_len = atoi(value); 159 ctx.cfg.max_msg_len = atoi(value);
161 else if (!strcmp(name, "max-repodesc-length")) 160 else if (!strcmp(name, "max-repodesc-length"))
162 ctx.cfg.max_repodesc_len = atoi(value); 161 ctx.cfg.max_repodesc_len = atoi(value);
163 else if (!strcmp(name, "max-commit-count")) 162 else if (!strcmp(name, "max-commit-count"))
164 ctx.cfg.max_commit_count = atoi(value); 163 ctx.cfg.max_commit_count = atoi(value);
165 else if (!strcmp(name, "summary-log")) 164 else if (!strcmp(name, "summary-log"))
166 ctx.cfg.summary_log = atoi(value); 165 ctx.cfg.summary_log = atoi(value);
167 else if (!strcmp(name, "summary-branches")) 166 else if (!strcmp(name, "summary-branches"))
168 ctx.cfg.summary_branches = atoi(value); 167 ctx.cfg.summary_branches = atoi(value);
169 else if (!strcmp(name, "summary-tags")) 168 else if (!strcmp(name, "summary-tags"))
170 ctx.cfg.summary_tags = atoi(value); 169 ctx.cfg.summary_tags = atoi(value);
171 else if (!strcmp(name, "agefile")) 170 else if (!strcmp(name, "agefile"))
172 ctx.cfg.agefile = xstrdup(value); 171 ctx.cfg.agefile = xstrdup(value);
173 else if (!strcmp(name, "renamelimit")) 172 else if (!strcmp(name, "renamelimit"))
174 ctx.cfg.renamelimit = atoi(value); 173 ctx.cfg.renamelimit = atoi(value);
175 else if (!strcmp(name, "robots")) 174 else if (!strcmp(name, "robots"))
176 ctx.cfg.robots = xstrdup(value); 175 ctx.cfg.robots = xstrdup(value);
177 else if (!strcmp(name, "clone-prefix")) 176 else if (!strcmp(name, "clone-prefix"))
178 ctx.cfg.clone_prefix = xstrdup(value); 177 ctx.cfg.clone_prefix = xstrdup(value);
179 else if (!strcmp(name, "repo.group")) 178 else if (!strcmp(name, "repo.group"))
180 ctx.cfg.repo_group = xstrdup(value); 179 ctx.cfg.repo_group = xstrdup(value);
181 else if (!strcmp(name, "repo.url")) 180 else if (!strcmp(name, "repo.url"))
182 cgit_repo = add_repo(value); 181 ctx.repo = add_repo(value);
183 else if (!strcmp(name, "repo.name")) 182 else if (!strcmp(name, "repo.name"))
184 cgit_repo->name = xstrdup(value); 183 ctx.repo->name = xstrdup(value);
185 else if (cgit_repo && !strcmp(name, "repo.path")) 184 else if (ctx.repo && !strcmp(name, "repo.path"))
186 cgit_repo->path = trim_end(value, '/'); 185 ctx.repo->path = trim_end(value, '/');
187 else if (cgit_repo && !strcmp(name, "repo.clone-url")) 186 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
188 cgit_repo->clone_url = xstrdup(value); 187 ctx.repo->clone_url = xstrdup(value);
189 else if (cgit_repo && !strcmp(name, "repo.desc")) 188 else if (ctx.repo && !strcmp(name, "repo.desc"))
190 cgit_repo->desc = xstrdup(value); 189 ctx.repo->desc = xstrdup(value);
191 else if (cgit_repo && !strcmp(name, "repo.owner")) 190 else if (ctx.repo && !strcmp(name, "repo.owner"))
192 cgit_repo->owner = xstrdup(value); 191 ctx.repo->owner = xstrdup(value);
193 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 192 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
194 cgit_repo->defbranch = xstrdup(value); 193 ctx.repo->defbranch = xstrdup(value);
195 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 194 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
196 cgit_repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 195 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
197 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 196 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
198 cgit_repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 197 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
199 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 198 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
200 cgit_repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 199 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
201 else if (cgit_repo && !strcmp(name, "repo.module-link")) 200 else if (ctx.repo && !strcmp(name, "repo.module-link"))
202 cgit_repo->module_link= xstrdup(value); 201 ctx.repo->module_link= xstrdup(value);
203 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { 202 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
204 if (*value == '/') 203 if (*value == '/')
205 cgit_repo->readme = xstrdup(value); 204 ctx.repo->readme = xstrdup(value);
206 else 205 else
207 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); 206 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
208 } else if (!strcmp(name, "include")) 207 } else if (!strcmp(name, "include"))
209 cgit_read_config(value, cgit_global_config_cb); 208 cgit_read_config(value, cgit_global_config_cb);
210} 209}
211 210
212void cgit_querystring_cb(const char *name, const char *value) 211void cgit_querystring_cb(const char *name, const char *value)
213{ 212{
214 if (!strcmp(name,"r")) { 213 if (!strcmp(name,"r")) {
215 ctx.qry.repo = xstrdup(value); 214 ctx.qry.repo = xstrdup(value);
216 cgit_repo = cgit_get_repoinfo(value); 215 ctx.repo = cgit_get_repoinfo(value);
217 } else if (!strcmp(name, "p")) { 216 } else if (!strcmp(name, "p")) {
218 ctx.qry.page = xstrdup(value); 217 ctx.qry.page = xstrdup(value);
219 cgit_cmd = cgit_get_cmd_index(value); 218 cgit_cmd = cgit_get_cmd_index(value);
220 } else if (!strcmp(name, "url")) { 219 } else if (!strcmp(name, "url")) {
221 cgit_parse_url(value); 220 cgit_parse_url(value);
222 } else if (!strcmp(name, "qt")) { 221 } else if (!strcmp(name, "qt")) {
223 ctx.qry.grep = xstrdup(value); 222 ctx.qry.grep = xstrdup(value);
224 } else if (!strcmp(name, "q")) { 223 } else if (!strcmp(name, "q")) {
225 ctx.qry.search = xstrdup(value); 224 ctx.qry.search = xstrdup(value);
226 } else if (!strcmp(name, "h")) { 225 } else if (!strcmp(name, "h")) {
227 ctx.qry.head = xstrdup(value); 226 ctx.qry.head = xstrdup(value);
228 ctx.qry.has_symref = 1; 227 ctx.qry.has_symref = 1;
229 } else if (!strcmp(name, "id")) { 228 } else if (!strcmp(name, "id")) {
230 ctx.qry.sha1 = xstrdup(value); 229 ctx.qry.sha1 = xstrdup(value);
231 ctx.qry.has_sha1 = 1; 230 ctx.qry.has_sha1 = 1;
232 } else if (!strcmp(name, "id2")) { 231 } else if (!strcmp(name, "id2")) {
233 ctx.qry.sha2 = xstrdup(value); 232 ctx.qry.sha2 = xstrdup(value);
234 ctx.qry.has_sha1 = 1; 233 ctx.qry.has_sha1 = 1;
235 } else if (!strcmp(name, "ofs")) { 234 } else if (!strcmp(name, "ofs")) {
236 ctx.qry.ofs = atoi(value); 235 ctx.qry.ofs = atoi(value);
237 } else if (!strcmp(name, "path")) { 236 } else if (!strcmp(name, "path")) {
238 ctx.qry.path = trim_end(value, '/'); 237 ctx.qry.path = trim_end(value, '/');
239 } else if (!strcmp(name, "name")) { 238 } else if (!strcmp(name, "name")) {
240 ctx.qry.name = xstrdup(value); 239 ctx.qry.name = xstrdup(value);
241 } 240 }
242} 241}
243 242
244void *cgit_free_commitinfo(struct commitinfo *info) 243void *cgit_free_commitinfo(struct commitinfo *info)
245{ 244{
246 free(info->author); 245 free(info->author);
247 free(info->author_email); 246 free(info->author_email);
248 free(info->committer); 247 free(info->committer);
249 free(info->committer_email); 248 free(info->committer_email);
250 free(info->subject); 249 free(info->subject);
251 free(info->msg); 250 free(info->msg);
252 free(info->msg_encoding); 251 free(info->msg_encoding);
253 free(info); 252 free(info);
254 return NULL; 253 return NULL;
255} 254}
256 255
257int hextoint(char c) 256int hextoint(char c)
258{ 257{
259 if (c >= 'a' && c <= 'f') 258 if (c >= 'a' && c <= 'f')
260 return 10 + c - 'a'; 259 return 10 + c - 'a';
261 else if (c >= 'A' && c <= 'F') 260 else if (c >= 'A' && c <= 'F')
262 return 10 + c - 'A'; 261 return 10 + c - 'A';
263 else if (c >= '0' && c <= '9') 262 else if (c >= '0' && c <= '9')
264 return c - '0'; 263 return c - '0';
265 else 264 else
266 return -1; 265 return -1;
267} 266}
268 267
269char *trim_end(const char *str, char c) 268char *trim_end(const char *str, char c)
270{ 269{
271 int len; 270 int len;
272 char *s, *t; 271 char *s, *t;
273 272
274 if (str == NULL) 273 if (str == NULL)
275 return NULL; 274 return NULL;
276 t = (char *)str; 275 t = (char *)str;
277 len = strlen(t); 276 len = strlen(t);
278 while(len > 0 && t[len - 1] == c) 277 while(len > 0 && t[len - 1] == c)
279 len--; 278 len--;
280 279
281 if (len == 0) 280 if (len == 0)
282 return NULL; 281 return NULL;
283 282
284 c = t[len]; 283 c = t[len];
285 t[len] = '\0'; 284 t[len] = '\0';
286 s = xstrdup(t); 285 s = xstrdup(t);
287 t[len] = c; 286 t[len] = c;
288 return s; 287 return s;
289} 288}
290 289
291char *strlpart(char *txt, int maxlen) 290char *strlpart(char *txt, int maxlen)
292{ 291{
293 char *result; 292 char *result;
294 293
295 if (!txt) 294 if (!txt)
296 return txt; 295 return txt;
297 296
298 if (strlen(txt) <= maxlen) 297 if (strlen(txt) <= maxlen)
299 return txt; 298 return txt;
300 result = xmalloc(maxlen + 1); 299 result = xmalloc(maxlen + 1);
301 memcpy(result, txt, maxlen - 3); 300 memcpy(result, txt, maxlen - 3);
302 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; 301 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
303 result[maxlen] = '\0'; 302 result[maxlen] = '\0';
304 return result; 303 return result;
305} 304}
306 305
307char *strrpart(char *txt, int maxlen) 306char *strrpart(char *txt, int maxlen)
308{ 307{
309 char *result; 308 char *result;
310 309
311 if (!txt) 310 if (!txt)
312 return txt; 311 return txt;
diff --git a/ui-commit.c b/ui-commit.c
index 3b0919b..25721ca 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -101,126 +101,126 @@ void cgit_count_diff_lines(char *line, int len)
101 lines_added++; 101 lines_added++;
102 else if (line[0] == '-') 102 else if (line[0] == '-')
103 lines_removed++; 103 lines_removed++;
104 } 104 }
105} 105}
106 106
107void inspect_filepair(struct diff_filepair *pair) 107void inspect_filepair(struct diff_filepair *pair)
108{ 108{
109 files++; 109 files++;
110 lines_added = 0; 110 lines_added = 0;
111 lines_removed = 0; 111 lines_removed = 0;
112 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); 112 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
113 if (files >= slots) { 113 if (files >= slots) {
114 if (slots == 0) 114 if (slots == 0)
115 slots = 4; 115 slots = 4;
116 else 116 else
117 slots = slots * 2; 117 slots = slots * 2;
118 items = xrealloc(items, slots * sizeof(struct fileinfo)); 118 items = xrealloc(items, slots * sizeof(struct fileinfo));
119 } 119 }
120 items[files-1].status = pair->status; 120 items[files-1].status = pair->status;
121 hashcpy(items[files-1].old_sha1, pair->one->sha1); 121 hashcpy(items[files-1].old_sha1, pair->one->sha1);
122 hashcpy(items[files-1].new_sha1, pair->two->sha1); 122 hashcpy(items[files-1].new_sha1, pair->two->sha1);
123 items[files-1].old_mode = pair->one->mode; 123 items[files-1].old_mode = pair->one->mode;
124 items[files-1].new_mode = pair->two->mode; 124 items[files-1].new_mode = pair->two->mode;
125 items[files-1].old_path = xstrdup(pair->one->path); 125 items[files-1].old_path = xstrdup(pair->one->path);
126 items[files-1].new_path = xstrdup(pair->two->path); 126 items[files-1].new_path = xstrdup(pair->two->path);
127 items[files-1].added = lines_added; 127 items[files-1].added = lines_added;
128 items[files-1].removed = lines_removed; 128 items[files-1].removed = lines_removed;
129 if (lines_added + lines_removed > max_changes) 129 if (lines_added + lines_removed > max_changes)
130 max_changes = lines_added + lines_removed; 130 max_changes = lines_added + lines_removed;
131 total_adds += lines_added; 131 total_adds += lines_added;
132 total_rems += lines_removed; 132 total_rems += lines_removed;
133} 133}
134 134
135 135
136void cgit_print_commit(char *hex) 136void cgit_print_commit(char *hex)
137{ 137{
138 struct commit *commit, *parent; 138 struct commit *commit, *parent;
139 struct commitinfo *info; 139 struct commitinfo *info;
140 struct commit_list *p; 140 struct commit_list *p;
141 unsigned char sha1[20]; 141 unsigned char sha1[20];
142 char *tmp; 142 char *tmp;
143 int i; 143 int i;
144 144
145 if (!hex) 145 if (!hex)
146 hex = ctx.qry.head; 146 hex = ctx.qry.head;
147 curr_rev = hex; 147 curr_rev = hex;
148 148
149 if (get_sha1(hex, sha1)) { 149 if (get_sha1(hex, sha1)) {
150 cgit_print_error(fmt("Bad object id: %s", hex)); 150 cgit_print_error(fmt("Bad object id: %s", hex));
151 return; 151 return;
152 } 152 }
153 commit = lookup_commit_reference(sha1); 153 commit = lookup_commit_reference(sha1);
154 if (!commit) { 154 if (!commit) {
155 cgit_print_error(fmt("Bad commit reference: %s", hex)); 155 cgit_print_error(fmt("Bad commit reference: %s", hex));
156 return; 156 return;
157 } 157 }
158 info = cgit_parse_commit(commit); 158 info = cgit_parse_commit(commit);
159 159
160 html("<table summary='commit info' class='commit-info'>\n"); 160 html("<table summary='commit info' class='commit-info'>\n");
161 html("<tr><th>author</th><td>"); 161 html("<tr><th>author</th><td>");
162 html_txt(info->author); 162 html_txt(info->author);
163 html(" "); 163 html(" ");
164 html_txt(info->author_email); 164 html_txt(info->author_email);
165 html("</td><td class='right'>"); 165 html("</td><td class='right'>");
166 cgit_print_date(info->author_date, FMT_LONGDATE); 166 cgit_print_date(info->author_date, FMT_LONGDATE);
167 html("</td></tr>\n"); 167 html("</td></tr>\n");
168 html("<tr><th>committer</th><td>"); 168 html("<tr><th>committer</th><td>");
169 html_txt(info->committer); 169 html_txt(info->committer);
170 html(" "); 170 html(" ");
171 html_txt(info->committer_email); 171 html_txt(info->committer_email);
172 html("</td><td class='right'>"); 172 html("</td><td class='right'>");
173 cgit_print_date(info->committer_date, FMT_LONGDATE); 173 cgit_print_date(info->committer_date, FMT_LONGDATE);
174 html("</td></tr>\n"); 174 html("</td></tr>\n");
175 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 175 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
176 tmp = xstrdup(hex); 176 tmp = xstrdup(hex);
177 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 177 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
178 ctx.qry.head, tmp, NULL); 178 ctx.qry.head, tmp, NULL);
179 html("</td></tr>\n"); 179 html("</td></tr>\n");
180 for (p = commit->parents; p ; p = p->next) { 180 for (p = commit->parents; p ; p = p->next) {
181 parent = lookup_commit_reference(p->item->object.sha1); 181 parent = lookup_commit_reference(p->item->object.sha1);
182 if (!parent) { 182 if (!parent) {
183 html("<tr><td colspan='3'>"); 183 html("<tr><td colspan='3'>");
184 cgit_print_error("Error reading parent commit"); 184 cgit_print_error("Error reading parent commit");
185 html("</td></tr>"); 185 html("</td></tr>");
186 continue; 186 continue;
187 } 187 }
188 html("<tr><th>parent</th>" 188 html("<tr><th>parent</th>"
189 "<td colspan='2' class='sha1'>"); 189 "<td colspan='2' class='sha1'>");
190 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, 190 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
191 ctx.qry.head, sha1_to_hex(p->item->object.sha1)); 191 ctx.qry.head, sha1_to_hex(p->item->object.sha1));
192 html(" ("); 192 html(" (");
193 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, 193 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
194 sha1_to_hex(p->item->object.sha1), NULL); 194 sha1_to_hex(p->item->object.sha1), NULL);
195 html(")</td></tr>"); 195 html(")</td></tr>");
196 } 196 }
197 if (cgit_repo->snapshots) { 197 if (ctx.repo->snapshots) {
198 html("<tr><th>download</th><td colspan='2' class='sha1'>"); 198 html("<tr><th>download</th><td colspan='2' class='sha1'>");
199 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, 199 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
200 hex, cgit_repo->snapshots); 200 hex, ctx.repo->snapshots);
201 html("</td></tr>"); 201 html("</td></tr>");
202 } 202 }
203 html("</table>\n"); 203 html("</table>\n");
204 html("<div class='commit-subject'>"); 204 html("<div class='commit-subject'>");
205 html_txt(info->subject); 205 html_txt(info->subject);
206 html("</div>"); 206 html("</div>");
207 html("<div class='commit-msg'>"); 207 html("<div class='commit-msg'>");
208 html_txt(info->msg); 208 html_txt(info->msg);
209 html("</div>"); 209 html("</div>");
210 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { 210 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
211 html("<div class='diffstat-header'>Diffstat</div>"); 211 html("<div class='diffstat-header'>Diffstat</div>");
212 html("<table summary='diffstat' class='diffstat'>"); 212 html("<table summary='diffstat' class='diffstat'>");
213 max_changes = 0; 213 max_changes = 0;
214 cgit_diff_commit(commit, inspect_filepair); 214 cgit_diff_commit(commit, inspect_filepair);
215 for(i = 0; i<files; i++) 215 for(i = 0; i<files; i++)
216 print_fileinfo(&items[i]); 216 print_fileinfo(&items[i]);
217 html("</table>"); 217 html("</table>");
218 html("<div class='diffstat-summary'>"); 218 html("<div class='diffstat-summary'>");
219 htmlf("%d files changed, %d insertions, %d deletions (", 219 htmlf("%d files changed, %d insertions, %d deletions (",
220 files, total_adds, total_rems); 220 files, total_adds, total_rems);
221 cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex, 221 cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
222 NULL, NULL); 222 NULL, NULL);
223 html(")</div>"); 223 html(")</div>");
224 } 224 }
225 cgit_free_commitinfo(info); 225 cgit_free_commitinfo(info);
226} 226}
diff --git a/ui-log.c b/ui-log.c
index a39474b..72e2a4b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,140 +1,140 @@
1/* ui-log.c: functions for log output 1/* ui-log.c: functions for log output
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
11int files, add_lines, rem_lines; 11int files, add_lines, rem_lines;
12 12
13void count_lines(char *line, int size) 13void count_lines(char *line, int size)
14{ 14{
15 if (size <= 0) 15 if (size <= 0)
16 return; 16 return;
17 17
18 if (line[0] == '+') 18 if (line[0] == '+')
19 add_lines++; 19 add_lines++;
20 20
21 else if (line[0] == '-') 21 else if (line[0] == '-')
22 rem_lines++; 22 rem_lines++;
23} 23}
24 24
25void inspect_files(struct diff_filepair *pair) 25void inspect_files(struct diff_filepair *pair)
26{ 26{
27 files++; 27 files++;
28 if (cgit_repo->enable_log_linecount) 28 if (ctx.repo->enable_log_linecount)
29 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 29 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
30} 30}
31 31
32void print_commit(struct commit *commit) 32void print_commit(struct commit *commit)
33{ 33{
34 struct commitinfo *info; 34 struct commitinfo *info;
35 35
36 info = cgit_parse_commit(commit); 36 info = cgit_parse_commit(commit);
37 html("<tr><td>"); 37 html("<tr><td>");
38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
39 html("</td><td>"); 39 html("</td><td>");
40 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 40 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
41 sha1_to_hex(commit->object.sha1)); 41 sha1_to_hex(commit->object.sha1));
42 if (cgit_repo->enable_log_filecount) { 42 if (ctx.repo->enable_log_filecount) {
43 files = 0; 43 files = 0;
44 add_lines = 0; 44 add_lines = 0;
45 rem_lines = 0; 45 rem_lines = 0;
46 cgit_diff_commit(commit, inspect_files); 46 cgit_diff_commit(commit, inspect_files);
47 html("</td><td class='right'>"); 47 html("</td><td class='right'>");
48 htmlf("%d", files); 48 htmlf("%d", files);
49 if (cgit_repo->enable_log_linecount) { 49 if (ctx.repo->enable_log_linecount) {
50 html("</td><td class='right'>"); 50 html("</td><td class='right'>");
51 htmlf("-%d/+%d", rem_lines, add_lines); 51 htmlf("-%d/+%d", rem_lines, add_lines);
52 } 52 }
53 } 53 }
54 html("</td><td>"); 54 html("</td><td>");
55 html_txt(info->author); 55 html_txt(info->author);
56 html("</td></tr>\n"); 56 html("</td></tr>\n");
57 cgit_free_commitinfo(info); 57 cgit_free_commitinfo(info);
58} 58}
59 59
60 60
61void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) 61void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
62{ 62{
63 struct rev_info rev; 63 struct rev_info rev;
64 struct commit *commit; 64 struct commit *commit;
65 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 65 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
66 int argc = 2; 66 int argc = 2;
67 int i; 67 int i;
68 68
69 if (!tip) 69 if (!tip)
70 argv[1] = ctx.qry.head; 70 argv[1] = ctx.qry.head;
71 71
72 if (grep && pattern && (!strcmp(grep, "grep") || 72 if (grep && pattern && (!strcmp(grep, "grep") ||
73 !strcmp(grep, "author") || 73 !strcmp(grep, "author") ||
74 !strcmp(grep, "committer"))) 74 !strcmp(grep, "committer")))
75 argv[argc++] = fmt("--%s=%s", grep, pattern); 75 argv[argc++] = fmt("--%s=%s", grep, pattern);
76 76
77 if (path) { 77 if (path) {
78 argv[argc++] = "--"; 78 argv[argc++] = "--";
79 argv[argc++] = path; 79 argv[argc++] = path;
80 } 80 }
81 init_revisions(&rev, NULL); 81 init_revisions(&rev, NULL);
82 rev.abbrev = DEFAULT_ABBREV; 82 rev.abbrev = DEFAULT_ABBREV;
83 rev.commit_format = CMIT_FMT_DEFAULT; 83 rev.commit_format = CMIT_FMT_DEFAULT;
84 rev.verbose_header = 1; 84 rev.verbose_header = 1;
85 rev.show_root_diff = 0; 85 rev.show_root_diff = 0;
86 setup_revisions(argc, argv, &rev, NULL); 86 setup_revisions(argc, argv, &rev, NULL);
87 if (rev.grep_filter) { 87 if (rev.grep_filter) {
88 rev.grep_filter->regflags |= REG_ICASE; 88 rev.grep_filter->regflags |= REG_ICASE;
89 compile_grep_patterns(rev.grep_filter); 89 compile_grep_patterns(rev.grep_filter);
90 } 90 }
91 prepare_revision_walk(&rev); 91 prepare_revision_walk(&rev);
92 92
93 html("<table summary='log' class='list nowrap'>"); 93 html("<table summary='log' class='list nowrap'>");
94 html("<tr class='nohover'><th class='left'>Age</th>" 94 html("<tr class='nohover'><th class='left'>Age</th>"
95 "<th class='left'>Message</th>"); 95 "<th class='left'>Message</th>");
96 96
97 if (cgit_repo->enable_log_filecount) { 97 if (ctx.repo->enable_log_filecount) {
98 html("<th class='right'>Files</th>"); 98 html("<th class='right'>Files</th>");
99 if (cgit_repo->enable_log_linecount) 99 if (ctx.repo->enable_log_linecount)
100 html("<th class='right'>Lines</th>"); 100 html("<th class='right'>Lines</th>");
101 } 101 }
102 html("<th class='left'>Author</th></tr>\n"); 102 html("<th class='left'>Author</th></tr>\n");
103 103
104 if (ofs<0) 104 if (ofs<0)
105 ofs = 0; 105 ofs = 0;
106 106
107 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 107 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
108 free(commit->buffer); 108 free(commit->buffer);
109 commit->buffer = NULL; 109 commit->buffer = NULL;
110 free_commit_list(commit->parents); 110 free_commit_list(commit->parents);
111 commit->parents = NULL; 111 commit->parents = NULL;
112 } 112 }
113 113
114 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 114 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
115 print_commit(commit); 115 print_commit(commit);
116 free(commit->buffer); 116 free(commit->buffer);
117 commit->buffer = NULL; 117 commit->buffer = NULL;
118 free_commit_list(commit->parents); 118 free_commit_list(commit->parents);
119 commit->parents = NULL; 119 commit->parents = NULL;
120 } 120 }
121 html("</table>\n"); 121 html("</table>\n");
122 122
123 if (pager) { 123 if (pager) {
124 html("<div class='pager'>"); 124 html("<div class='pager'>");
125 if (ofs > 0) { 125 if (ofs > 0) {
126 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, 126 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
127 ctx.qry.sha1, ctx.qry.path, 127 ctx.qry.sha1, ctx.qry.path,
128 ofs - cnt, ctx.qry.grep, 128 ofs - cnt, ctx.qry.grep,
129 ctx.qry.search); 129 ctx.qry.search);
130 html("&nbsp;"); 130 html("&nbsp;");
131 } 131 }
132 if ((commit = get_revision(&rev)) != NULL) { 132 if ((commit = get_revision(&rev)) != NULL) {
133 cgit_log_link("[next]", NULL, NULL, ctx.qry.head, 133 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
134 ctx.qry.sha1, ctx.qry.path, 134 ctx.qry.sha1, ctx.qry.path,
135 ofs + cnt, ctx.qry.grep, 135 ofs + cnt, ctx.qry.grep,
136 ctx.qry.search); 136 ctx.qry.search);
137 } 137 }
138 html("</div>"); 138 html("</div>");
139 } 139 }
140} 140}
diff --git a/ui-repolist.c b/ui-repolist.c
index a6cc2cc..5fde174 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,110 +1,110 @@
1/* ui-repolist.c: functions for generating the repolist page 1/* ui-repolist.c: functions for generating the repolist page
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#include <time.h> 10#include <time.h>
11 11
12 12
13time_t read_agefile(char *path) 13time_t read_agefile(char *path)
14{ 14{
15 FILE *f; 15 FILE *f;
16 static char buf[64], buf2[64]; 16 static char buf[64], buf2[64];
17 17
18 if (!(f = fopen(path, "r"))) 18 if (!(f = fopen(path, "r")))
19 return -1; 19 return -1;
20 fgets(buf, sizeof(buf), f); 20 fgets(buf, sizeof(buf), f);
21 fclose(f); 21 fclose(f);
22 if (parse_date(buf, buf2, sizeof(buf2))) 22 if (parse_date(buf, buf2, sizeof(buf2)))
23 return strtoul(buf2, NULL, 10); 23 return strtoul(buf2, NULL, 10);
24 else 24 else
25 return 0; 25 return 0;
26} 26}
27 27
28static void print_modtime(struct repoinfo *repo) 28static void print_modtime(struct cgit_repo *repo)
29{ 29{
30 char *path; 30 char *path;
31 struct stat s; 31 struct stat s;
32 32
33 path = fmt("%s/%s", repo->path, ctx.cfg.agefile); 33 path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
34 if (stat(path, &s) == 0) { 34 if (stat(path, &s) == 0) {
35 cgit_print_age(read_agefile(path), -1, NULL); 35 cgit_print_age(read_agefile(path), -1, NULL);
36 return; 36 return;
37 } 37 }
38 38
39 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); 39 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
40 if (stat(path, &s) != 0) 40 if (stat(path, &s) != 0)
41 return; 41 return;
42 cgit_print_age(s.st_mtime, -1, NULL); 42 cgit_print_age(s.st_mtime, -1, NULL);
43} 43}
44 44
45void cgit_print_repolist(struct cacheitem *item) 45void cgit_print_repolist(struct cacheitem *item)
46{ 46{
47 int i, columns = 4; 47 int i, columns = 4;
48 char *last_group = NULL; 48 char *last_group = NULL;
49 49
50 if (ctx.cfg.enable_index_links) 50 if (ctx.cfg.enable_index_links)
51 columns++; 51 columns++;
52 52
53 cgit_print_docstart(ctx.cfg.root_title, item); 53 cgit_print_docstart(ctx.cfg.root_title, item);
54 cgit_print_pageheader(ctx.cfg.root_title, 0); 54 cgit_print_pageheader(ctx.cfg.root_title, 0);
55 55
56 html("<table summary='repository list' class='list nowrap'>"); 56 html("<table summary='repository list' class='list nowrap'>");
57 if (ctx.cfg.index_header) { 57 if (ctx.cfg.index_header) {
58 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", 58 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
59 columns); 59 columns);
60 html_include(ctx.cfg.index_header); 60 html_include(ctx.cfg.index_header);
61 html("</td></tr>"); 61 html("</td></tr>");
62 } 62 }
63 html("<tr class='nohover'>" 63 html("<tr class='nohover'>"
64 "<th class='left'>Name</th>" 64 "<th class='left'>Name</th>"
65 "<th class='left'>Description</th>" 65 "<th class='left'>Description</th>"
66 "<th class='left'>Owner</th>" 66 "<th class='left'>Owner</th>"
67 "<th class='left'>Idle</th>"); 67 "<th class='left'>Idle</th>");
68 if (ctx.cfg.enable_index_links) 68 if (ctx.cfg.enable_index_links)
69 html("<th>Links</th>"); 69 html("<th>Links</th>");
70 html("</tr>\n"); 70 html("</tr>\n");
71 71
72 for (i=0; i<cgit_repolist.count; i++) { 72 for (i=0; i<cgit_repolist.count; i++) {
73 cgit_repo = &cgit_repolist.repos[i]; 73 ctx.repo = &cgit_repolist.repos[i];
74 if ((last_group == NULL && cgit_repo->group != NULL) || 74 if ((last_group == NULL && ctx.repo->group != NULL) ||
75 (last_group != NULL && cgit_repo->group == NULL) || 75 (last_group != NULL && ctx.repo->group == NULL) ||
76 (last_group != NULL && cgit_repo->group != NULL && 76 (last_group != NULL && ctx.repo->group != NULL &&
77 strcmp(cgit_repo->group, last_group))) { 77 strcmp(ctx.repo->group, last_group))) {
78 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", 78 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
79 columns); 79 columns);
80 html_txt(cgit_repo->group); 80 html_txt(ctx.repo->group);
81 html("</td></tr>"); 81 html("</td></tr>");
82 last_group = cgit_repo->group; 82 last_group = ctx.repo->group;
83 } 83 }
84 htmlf("<tr><td class='%s'>", 84 htmlf("<tr><td class='%s'>",
85 cgit_repo->group ? "sublevel-repo" : "toplevel-repo"); 85 ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
86 html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL); 86 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
87 html_txt(cgit_repo->name); 87 html_txt(ctx.repo->name);
88 html_link_close(); 88 html_link_close();
89 html("</td><td>"); 89 html("</td><td>");
90 html_ntxt(ctx.cfg.max_repodesc_len, cgit_repo->desc); 90 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
91 html("</td><td>"); 91 html("</td><td>");
92 html_txt(cgit_repo->owner); 92 html_txt(ctx.repo->owner);
93 html("</td><td>"); 93 html("</td><td>");
94 print_modtime(cgit_repo); 94 print_modtime(ctx.repo);
95 html("</td>"); 95 html("</td>");
96 if (ctx.cfg.enable_index_links) { 96 if (ctx.cfg.enable_index_links) {
97 html("<td>"); 97 html("<td>");
98 html_link_open(cgit_repourl(cgit_repo->url), 98 html_link_open(cgit_repourl(ctx.repo->url),
99 NULL, "button"); 99 NULL, "button");
100 html("summary</a>"); 100 html("summary</a>");
101 cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 101 cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
102 0, NULL, NULL); 102 0, NULL, NULL);
103 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); 103 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
104 html("</td>"); 104 html("</td>");
105 } 105 }
106 html("</tr>\n"); 106 html("</tr>\n");
107 } 107 }
108 html("</table>"); 108 html("</table>");
109 cgit_print_docend(); 109 cgit_print_docend();
110} 110}
diff --git a/ui-shared.c b/ui-shared.c
index b96237d..b9f487a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -48,216 +48,216 @@ char *cgit_rooturl()
48 return ctx.cfg.script_name; 48 return ctx.cfg.script_name;
49} 49}
50 50
51char *cgit_repourl(const char *reponame) 51char *cgit_repourl(const char *reponame)
52{ 52{
53 if (ctx.cfg.virtual_root) { 53 if (ctx.cfg.virtual_root) {
54 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 54 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
55 } else { 55 } else {
56 return fmt("?r=%s", reponame); 56 return fmt("?r=%s", reponame);
57 } 57 }
58} 58}
59 59
60char *cgit_fileurl(const char *reponame, const char *pagename, 60char *cgit_fileurl(const char *reponame, const char *pagename,
61 const char *filename, const char *query) 61 const char *filename, const char *query)
62{ 62{
63 char *tmp; 63 char *tmp;
64 char *delim; 64 char *delim;
65 65
66 if (ctx.cfg.virtual_root) { 66 if (ctx.cfg.virtual_root) {
67 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, 67 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
68 pagename, (filename ? filename:"")); 68 pagename, (filename ? filename:""));
69 delim = "?"; 69 delim = "?";
70 } else { 70 } else {
71 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 71 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
72 (filename ? filename : "")); 72 (filename ? filename : ""));
73 delim = "&"; 73 delim = "&";
74 } 74 }
75 if (query) 75 if (query)
76 tmp = fmt("%s%s%s", tmp, delim, query); 76 tmp = fmt("%s%s%s", tmp, delim, query);
77 return tmp; 77 return tmp;
78} 78}
79 79
80char *cgit_pageurl(const char *reponame, const char *pagename, 80char *cgit_pageurl(const char *reponame, const char *pagename,
81 const char *query) 81 const char *query)
82{ 82{
83 return cgit_fileurl(reponame,pagename,0,query); 83 return cgit_fileurl(reponame,pagename,0,query);
84} 84}
85 85
86const char *cgit_repobasename(const char *reponame) 86const char *cgit_repobasename(const char *reponame)
87{ 87{
88 /* I assume we don't need to store more than one repo basename */ 88 /* I assume we don't need to store more than one repo basename */
89 static char rvbuf[1024]; 89 static char rvbuf[1024];
90 int p; 90 int p;
91 const char *rv; 91 const char *rv;
92 strncpy(rvbuf,reponame,sizeof(rvbuf)); 92 strncpy(rvbuf,reponame,sizeof(rvbuf));
93 if(rvbuf[sizeof(rvbuf)-1]) 93 if(rvbuf[sizeof(rvbuf)-1])
94 die("cgit_repobasename: truncated repository name '%s'", reponame); 94 die("cgit_repobasename: truncated repository name '%s'", reponame);
95 p = strlen(rvbuf)-1; 95 p = strlen(rvbuf)-1;
96 /* strip trailing slashes */ 96 /* strip trailing slashes */
97 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 97 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
98 /* strip trailing .git */ 98 /* strip trailing .git */
99 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 99 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
100 p -= 3; rvbuf[p--] = 0; 100 p -= 3; rvbuf[p--] = 0;
101 } 101 }
102 /* strip more trailing slashes if any */ 102 /* strip more trailing slashes if any */
103 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 103 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
104 /* find last slash in the remaining string */ 104 /* find last slash in the remaining string */
105 rv = strrchr(rvbuf,'/'); 105 rv = strrchr(rvbuf,'/');
106 if(rv) 106 if(rv)
107 return ++rv; 107 return ++rv;
108 return rvbuf; 108 return rvbuf;
109} 109}
110 110
111char *cgit_currurl() 111char *cgit_currurl()
112{ 112{
113 if (!ctx.cfg.virtual_root) 113 if (!ctx.cfg.virtual_root)
114 return ctx.cfg.script_name; 114 return ctx.cfg.script_name;
115 else if (ctx.qry.page) 115 else if (ctx.qry.page)
116 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 116 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
117 else if (ctx.qry.repo) 117 else if (ctx.qry.repo)
118 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 118 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
119 else 119 else
120 return fmt("%s/", ctx.cfg.virtual_root); 120 return fmt("%s/", ctx.cfg.virtual_root);
121} 121}
122 122
123static char *repolink(char *title, char *class, char *page, char *head, 123static char *repolink(char *title, char *class, char *page, char *head,
124 char *path) 124 char *path)
125{ 125{
126 char *delim = "?"; 126 char *delim = "?";
127 127
128 html("<a"); 128 html("<a");
129 if (title) { 129 if (title) {
130 html(" title='"); 130 html(" title='");
131 html_attr(title); 131 html_attr(title);
132 html("'"); 132 html("'");
133 } 133 }
134 if (class) { 134 if (class) {
135 html(" class='"); 135 html(" class='");
136 html_attr(class); 136 html_attr(class);
137 html("'"); 137 html("'");
138 } 138 }
139 html(" href='"); 139 html(" href='");
140 if (ctx.cfg.virtual_root) { 140 if (ctx.cfg.virtual_root) {
141 html_attr(ctx.cfg.virtual_root); 141 html_attr(ctx.cfg.virtual_root);
142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
143 html("/"); 143 html("/");
144 html_attr(cgit_repo->url); 144 html_attr(ctx.repo->url);
145 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') 145 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
146 html("/"); 146 html("/");
147 if (page) { 147 if (page) {
148 html(page); 148 html(page);
149 html("/"); 149 html("/");
150 if (path) 150 if (path)
151 html_attr(path); 151 html_attr(path);
152 } 152 }
153 } else { 153 } else {
154 html(ctx.cfg.script_name); 154 html(ctx.cfg.script_name);
155 html("?url="); 155 html("?url=");
156 html_attr(cgit_repo->url); 156 html_attr(ctx.repo->url);
157 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') 157 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
158 html("/"); 158 html("/");
159 if (page) { 159 if (page) {
160 html(page); 160 html(page);
161 html("/"); 161 html("/");
162 if (path) 162 if (path)
163 html_attr(path); 163 html_attr(path);
164 } 164 }
165 delim = "&amp;"; 165 delim = "&amp;";
166 } 166 }
167 if (head && strcmp(head, cgit_repo->defbranch)) { 167 if (head && strcmp(head, ctx.repo->defbranch)) {
168 html(delim); 168 html(delim);
169 html("h="); 169 html("h=");
170 html_attr(head); 170 html_attr(head);
171 delim = "&amp;"; 171 delim = "&amp;";
172 } 172 }
173 return fmt("%s", delim); 173 return fmt("%s", delim);
174} 174}
175 175
176static void reporevlink(char *page, char *name, char *title, char *class, 176static void reporevlink(char *page, char *name, char *title, char *class,
177 char *head, char *rev, char *path) 177 char *head, char *rev, char *path)
178{ 178{
179 char *delim; 179 char *delim;
180 180
181 delim = repolink(title, class, page, head, path); 181 delim = repolink(title, class, page, head, path);
182 if (rev && strcmp(rev, ctx.qry.head)) { 182 if (rev && strcmp(rev, ctx.qry.head)) {
183 html(delim); 183 html(delim);
184 html("id="); 184 html("id=");
185 html_attr(rev); 185 html_attr(rev);
186 } 186 }
187 html("'>"); 187 html("'>");
188 html_txt(name); 188 html_txt(name);
189 html("</a>"); 189 html("</a>");
190} 190}
191 191
192void cgit_tree_link(char *name, char *title, char *class, char *head, 192void cgit_tree_link(char *name, char *title, char *class, char *head,
193 char *rev, char *path) 193 char *rev, char *path)
194{ 194{
195 reporevlink("tree", name, title, class, head, rev, path); 195 reporevlink("tree", name, title, class, head, rev, path);
196} 196}
197 197
198void cgit_log_link(char *name, char *title, char *class, char *head, 198void cgit_log_link(char *name, char *title, char *class, char *head,
199 char *rev, char *path, int ofs, char *grep, char *pattern) 199 char *rev, char *path, int ofs, char *grep, char *pattern)
200{ 200{
201 char *delim; 201 char *delim;
202 202
203 delim = repolink(title, class, "log", head, path); 203 delim = repolink(title, class, "log", head, path);
204 if (rev && strcmp(rev, ctx.qry.head)) { 204 if (rev && strcmp(rev, ctx.qry.head)) {
205 html(delim); 205 html(delim);
206 html("id="); 206 html("id=");
207 html_attr(rev); 207 html_attr(rev);
208 delim = "&"; 208 delim = "&";
209 } 209 }
210 if (grep && pattern) { 210 if (grep && pattern) {
211 html(delim); 211 html(delim);
212 html("qt="); 212 html("qt=");
213 html_attr(grep); 213 html_attr(grep);
214 delim = "&"; 214 delim = "&";
215 html(delim); 215 html(delim);
216 html("q="); 216 html("q=");
217 html_attr(pattern); 217 html_attr(pattern);
218 } 218 }
219 if (ofs > 0) { 219 if (ofs > 0) {
220 html(delim); 220 html(delim);
221 html("ofs="); 221 html("ofs=");
222 htmlf("%d", ofs); 222 htmlf("%d", ofs);
223 } 223 }
224 html("'>"); 224 html("'>");
225 html_txt(name); 225 html_txt(name);
226 html("</a>"); 226 html("</a>");
227} 227}
228 228
229void cgit_commit_link(char *name, char *title, char *class, char *head, 229void cgit_commit_link(char *name, char *title, char *class, char *head,
230 char *rev) 230 char *rev)
231{ 231{
232 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 232 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
233 name[ctx.cfg.max_msg_len] = '\0'; 233 name[ctx.cfg.max_msg_len] = '\0';
234 name[ctx.cfg.max_msg_len - 1] = '.'; 234 name[ctx.cfg.max_msg_len - 1] = '.';
235 name[ctx.cfg.max_msg_len - 2] = '.'; 235 name[ctx.cfg.max_msg_len - 2] = '.';
236 name[ctx.cfg.max_msg_len - 3] = '.'; 236 name[ctx.cfg.max_msg_len - 3] = '.';
237 } 237 }
238 reporevlink("commit", name, title, class, head, rev, NULL); 238 reporevlink("commit", name, title, class, head, rev, NULL);
239} 239}
240 240
241void cgit_refs_link(char *name, char *title, char *class, char *head, 241void cgit_refs_link(char *name, char *title, char *class, char *head,
242 char *rev, char *path) 242 char *rev, char *path)
243{ 243{
244 reporevlink("refs", name, title, class, head, rev, path); 244 reporevlink("refs", name, title, class, head, rev, path);
245} 245}
246 246
247void cgit_snapshot_link(char *name, char *title, char *class, char *head, 247void cgit_snapshot_link(char *name, char *title, char *class, char *head,
248 char *rev, char *archivename) 248 char *rev, char *archivename)
249{ 249{
250 reporevlink("snapshot", name, title, class, head, rev, archivename); 250 reporevlink("snapshot", name, title, class, head, rev, archivename);
251} 251}
252 252
253void cgit_diff_link(char *name, char *title, char *class, char *head, 253void cgit_diff_link(char *name, char *title, char *class, char *head,
254 char *new_rev, char *old_rev, char *path) 254 char *new_rev, char *old_rev, char *path)
255{ 255{
256 char *delim; 256 char *delim;
257 257
258 delim = repolink(title, class, "diff", head, path); 258 delim = repolink(title, class, "diff", head, path);
259 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 259 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
260 html(delim); 260 html(delim);
261 html("id="); 261 html("id=");
262 html_attr(new_rev); 262 html_attr(new_rev);
263 delim = "&amp;"; 263 delim = "&amp;";
@@ -353,218 +353,218 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
353 } 353 }
354 if (secs < TM_YEAR * 2) { 354 if (secs < TM_YEAR * 2) {
355 htmlf("<span class='age-months'>%.0f months</span>", 355 htmlf("<span class='age-months'>%.0f months</span>",
356 secs * 1.0 / TM_MONTH); 356 secs * 1.0 / TM_MONTH);
357 return; 357 return;
358 } 358 }
359 htmlf("<span class='age-years'>%.0f years</span>", 359 htmlf("<span class='age-years'>%.0f years</span>",
360 secs * 1.0 / TM_YEAR); 360 secs * 1.0 / TM_YEAR);
361} 361}
362 362
363void cgit_print_docstart(char *title, struct cacheitem *item) 363void cgit_print_docstart(char *title, struct cacheitem *item)
364{ 364{
365 html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); 365 html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
366 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 366 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
367 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 367 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
368 ttl_seconds(item->ttl))); 368 ttl_seconds(item->ttl)));
369 html("\n"); 369 html("\n");
370 html(cgit_doctype); 370 html(cgit_doctype);
371 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 371 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
372 html("<head>\n"); 372 html("<head>\n");
373 html("<title>"); 373 html("<title>");
374 html_txt(title); 374 html_txt(title);
375 html("</title>\n"); 375 html("</title>\n");
376 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 376 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
377 if (ctx.cfg.robots && *ctx.cfg.robots) 377 if (ctx.cfg.robots && *ctx.cfg.robots)
378 htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots); 378 htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
379 html("<link rel='stylesheet' type='text/css' href='"); 379 html("<link rel='stylesheet' type='text/css' href='");
380 html_attr(ctx.cfg.css); 380 html_attr(ctx.cfg.css);
381 html("'/>\n"); 381 html("'/>\n");
382 html("</head>\n"); 382 html("</head>\n");
383 html("<body>\n"); 383 html("<body>\n");
384} 384}
385 385
386void cgit_print_docend() 386void cgit_print_docend()
387{ 387{
388 html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); 388 html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
389} 389}
390 390
391int print_branch_option(const char *refname, const unsigned char *sha1, 391int print_branch_option(const char *refname, const unsigned char *sha1,
392 int flags, void *cb_data) 392 int flags, void *cb_data)
393{ 393{
394 char *name = (char *)refname; 394 char *name = (char *)refname;
395 html_option(name, name, ctx.qry.head); 395 html_option(name, name, ctx.qry.head);
396 return 0; 396 return 0;
397} 397}
398 398
399int print_archive_ref(const char *refname, const unsigned char *sha1, 399int print_archive_ref(const char *refname, const unsigned char *sha1,
400 int flags, void *cb_data) 400 int flags, void *cb_data)
401{ 401{
402 struct tag *tag; 402 struct tag *tag;
403 struct taginfo *info; 403 struct taginfo *info;
404 struct object *obj; 404 struct object *obj;
405 char buf[256], *url; 405 char buf[256], *url;
406 unsigned char fileid[20]; 406 unsigned char fileid[20];
407 int *header = (int *)cb_data; 407 int *header = (int *)cb_data;
408 408
409 if (prefixcmp(refname, "refs/archives")) 409 if (prefixcmp(refname, "refs/archives"))
410 return 0; 410 return 0;
411 strncpy(buf, refname+14, sizeof(buf)); 411 strncpy(buf, refname+14, sizeof(buf));
412 obj = parse_object(sha1); 412 obj = parse_object(sha1);
413 if (!obj) 413 if (!obj)
414 return 1; 414 return 1;
415 if (obj->type == OBJ_TAG) { 415 if (obj->type == OBJ_TAG) {
416 tag = lookup_tag(sha1); 416 tag = lookup_tag(sha1);
417 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 417 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
418 return 0; 418 return 0;
419 hashcpy(fileid, tag->tagged->sha1); 419 hashcpy(fileid, tag->tagged->sha1);
420 } else if (obj->type != OBJ_BLOB) { 420 } else if (obj->type != OBJ_BLOB) {
421 return 0; 421 return 0;
422 } else { 422 } else {
423 hashcpy(fileid, sha1); 423 hashcpy(fileid, sha1);
424 } 424 }
425 if (!*header) { 425 if (!*header) {
426 html("<h1>download</h1>\n"); 426 html("<h1>download</h1>\n");
427 *header = 1; 427 *header = 1;
428 } 428 }
429 url = cgit_pageurl(ctx.qry.repo, "blob", 429 url = cgit_pageurl(ctx.qry.repo, "blob",
430 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 430 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
431 buf)); 431 buf));
432 html_link_open(url, NULL, "menu"); 432 html_link_open(url, NULL, "menu");
433 html_txt(strlpart(buf, 20)); 433 html_txt(strlpart(buf, 20));
434 html_link_close(); 434 html_link_close();
435 return 0; 435 return 0;
436} 436}
437 437
438void add_hidden_formfields(int incl_head, int incl_search, char *page) 438void add_hidden_formfields(int incl_head, int incl_search, char *page)
439{ 439{
440 char *url; 440 char *url;
441 441
442 if (!ctx.cfg.virtual_root) { 442 if (!ctx.cfg.virtual_root) {
443 url = fmt("%s/%s", ctx.qry.repo, page); 443 url = fmt("%s/%s", ctx.qry.repo, page);
444 if (ctx.qry.path) 444 if (ctx.qry.path)
445 url = fmt("%s/%s", url, ctx.qry.path); 445 url = fmt("%s/%s", url, ctx.qry.path);
446 html_hidden("url", url); 446 html_hidden("url", url);
447 } 447 }
448 448
449 if (incl_head && strcmp(ctx.qry.head, cgit_repo->defbranch)) 449 if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
450 html_hidden("h", ctx.qry.head); 450 html_hidden("h", ctx.qry.head);
451 451
452 if (ctx.qry.sha1) 452 if (ctx.qry.sha1)
453 html_hidden("id", ctx.qry.sha1); 453 html_hidden("id", ctx.qry.sha1);
454 if (ctx.qry.sha2) 454 if (ctx.qry.sha2)
455 html_hidden("id2", ctx.qry.sha2); 455 html_hidden("id2", ctx.qry.sha2);
456 456
457 if (incl_search) { 457 if (incl_search) {
458 if (ctx.qry.grep) 458 if (ctx.qry.grep)
459 html_hidden("qt", ctx.qry.grep); 459 html_hidden("qt", ctx.qry.grep);
460 if (ctx.qry.search) 460 if (ctx.qry.search)
461 html_hidden("q", ctx.qry.search); 461 html_hidden("q", ctx.qry.search);
462 } 462 }
463} 463}
464 464
465void cgit_print_pageheader(char *title, int show_search) 465void cgit_print_pageheader(char *title, int show_search)
466{ 466{
467 static const char *default_info = "This is cgit, a fast webinterface for git repositories"; 467 static const char *default_info = "This is cgit, a fast webinterface for git repositories";
468 int header = 0; 468 int header = 0;
469 char *url; 469 char *url;
470 470
471 html("<table id='layout' summary=''>\n"); 471 html("<table id='layout' summary=''>\n");
472 html("<tr><td id='sidebar'>\n"); 472 html("<tr><td id='sidebar'>\n");
473 html("<table class='sidebar' cellspacing='0' summary=''>\n"); 473 html("<table class='sidebar' cellspacing='0' summary=''>\n");
474 html("<tr><td class='sidebar'>\n<a href='"); 474 html("<tr><td class='sidebar'>\n<a href='");
475 html_attr(cgit_rooturl()); 475 html_attr(cgit_rooturl());
476 htmlf("'><img src='%s' alt='cgit'/></a>\n", 476 htmlf("'><img src='%s' alt='cgit'/></a>\n",
477 ctx.cfg.logo); 477 ctx.cfg.logo);
478 html("</td></tr>\n<tr><td class='sidebar'>\n"); 478 html("</td></tr>\n<tr><td class='sidebar'>\n");
479 if (ctx.qry.repo) { 479 if (ctx.qry.repo) {
480 html("<h1 class='first'>"); 480 html("<h1 class='first'>");
481 html_txt(strrpart(cgit_repo->name, 20)); 481 html_txt(strrpart(ctx.repo->name, 20));
482 html("</h1>\n"); 482 html("</h1>\n");
483 html_txt(cgit_repo->desc); 483 html_txt(ctx.repo->desc);
484 if (cgit_repo->owner) { 484 if (ctx.repo->owner) {
485 html("<h1>owner</h1>\n"); 485 html("<h1>owner</h1>\n");
486 html_txt(cgit_repo->owner); 486 html_txt(ctx.repo->owner);
487 } 487 }
488 html("<h1>navigate</h1>\n"); 488 html("<h1>navigate</h1>\n");
489 reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head, 489 reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
490 NULL, NULL); 490 NULL, NULL);
491 cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL, 491 cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,
492 0, NULL, NULL); 492 0, NULL, NULL);
493 cgit_tree_link("tree", NULL, "menu", ctx.qry.head, 493 cgit_tree_link("tree", NULL, "menu", ctx.qry.head,
494 ctx.qry.sha1, NULL); 494 ctx.qry.sha1, NULL);
495 cgit_commit_link("commit", NULL, "menu", ctx.qry.head, 495 cgit_commit_link("commit", NULL, "menu", ctx.qry.head,
496 ctx.qry.sha1); 496 ctx.qry.sha1);
497 cgit_diff_link("diff", NULL, "menu", ctx.qry.head, 497 cgit_diff_link("diff", NULL, "menu", ctx.qry.head,
498 ctx.qry.sha1, ctx.qry.sha2, NULL); 498 ctx.qry.sha1, ctx.qry.sha2, NULL);
499 cgit_patch_link("patch", NULL, "menu", ctx.qry.head, 499 cgit_patch_link("patch", NULL, "menu", ctx.qry.head,
500 ctx.qry.sha1); 500 ctx.qry.sha1);
501 501
502 for_each_ref(print_archive_ref, &header); 502 for_each_ref(print_archive_ref, &header);
503 503
504 if (cgit_repo->clone_url || ctx.cfg.clone_prefix) { 504 if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
505 html("<h1>clone</h1>\n"); 505 html("<h1>clone</h1>\n");
506 if (cgit_repo->clone_url) 506 if (ctx.repo->clone_url)
507 url = cgit_repo->clone_url; 507 url = ctx.repo->clone_url;
508 else 508 else
509 url = fmt("%s%s", ctx.cfg.clone_prefix, 509 url = fmt("%s%s", ctx.cfg.clone_prefix,
510 cgit_repo->url); 510 ctx.repo->url);
511 html("<a class='menu' href='"); 511 html("<a class='menu' href='");
512 html_attr(url); 512 html_attr(url);
513 html("' title='"); 513 html("' title='");
514 html_attr(url); 514 html_attr(url);
515 html("'>\n"); 515 html("'>\n");
516 html_txt(strrpart(url, 20)); 516 html_txt(strrpart(url, 20));
517 html("</a>\n"); 517 html("</a>\n");
518 } 518 }
519 519
520 html("<h1>branch</h1>\n"); 520 html("<h1>branch</h1>\n");
521 html("<form method='get' action=''>\n"); 521 html("<form method='get' action=''>\n");
522 add_hidden_formfields(0, 1, ctx.qry.page); 522 add_hidden_formfields(0, 1, ctx.qry.page);
523 // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); 523 // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
524 html("<select name='h' onchange='this.form.submit();'>\n"); 524 html("<select name='h' onchange='this.form.submit();'>\n");
525 for_each_branch_ref(print_branch_option, ctx.qry.head); 525 for_each_branch_ref(print_branch_option, ctx.qry.head);
526 html("</select>\n"); 526 html("</select>\n");
527 // html("</td><td>"); 527 // html("</td><td>");
528 html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); 528 html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
529 // html("</td></tr></table>"); 529 // html("</td></tr></table>");
530 html("</form>\n"); 530 html("</form>\n");
531 531
532 html("<h1>search</h1>\n"); 532 html("<h1>search</h1>\n");
533 html("<form method='get' action='"); 533 html("<form method='get' action='");
534 if (ctx.cfg.virtual_root) 534 if (ctx.cfg.virtual_root)
535 html_attr(cgit_fileurl(ctx.qry.repo, "log", 535 html_attr(cgit_fileurl(ctx.qry.repo, "log",
536 ctx.qry.path, NULL)); 536 ctx.qry.path, NULL));
537 html("'>\n"); 537 html("'>\n");
538 add_hidden_formfields(1, 0, "log"); 538 add_hidden_formfields(1, 0, "log");
539 html("<select name='qt'>\n"); 539 html("<select name='qt'>\n");
540 html_option("grep", "log msg", ctx.qry.grep); 540 html_option("grep", "log msg", ctx.qry.grep);
541 html_option("author", "author", ctx.qry.grep); 541 html_option("author", "author", ctx.qry.grep);
542 html_option("committer", "committer", ctx.qry.grep); 542 html_option("committer", "committer", ctx.qry.grep);
543 html("</select>\n"); 543 html("</select>\n");
544 html("<input class='txt' type='text' name='q' value='"); 544 html("<input class='txt' type='text' name='q' value='");
545 html_attr(ctx.qry.search); 545 html_attr(ctx.qry.search);
546 html("'/>\n"); 546 html("'/>\n");
547 html("</form>\n"); 547 html("</form>\n");
548 } else { 548 } else {
549 if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info)) 549 if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info))
550 html(default_info); 550 html(default_info);
551 } 551 }
552 552
553 html("</td></tr></table></td>\n"); 553 html("</td></tr></table></td>\n");
554 554
555 html("<td id='content'>\n"); 555 html("<td id='content'>\n");
556} 556}
557 557
558 558
559void cgit_print_snapshot_start(const char *mimetype, const char *filename, 559void cgit_print_snapshot_start(const char *mimetype, const char *filename,
560 struct cacheitem *item) 560 struct cacheitem *item)
561{ 561{
562 htmlf("Content-Type: %s\n", mimetype); 562 htmlf("Content-Type: %s\n", mimetype);
563 htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); 563 htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
564 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 564 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
565 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 565 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
566 ttl_seconds(item->ttl))); 566 ttl_seconds(item->ttl)));
567 html("\n"); 567 html("\n");
568} 568}
569 569
570/* vim:set sw=8: */ 570/* vim:set sw=8: */
diff --git a/ui-summary.c b/ui-summary.c
index 0a44994..3baac08 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -89,112 +89,112 @@ static int print_tag(struct refinfo *ref)
89 char *url, *name = (char *)ref->refname; 89 char *url, *name = (char *)ref->refname;
90 90
91 if (ref->object->type == OBJ_TAG) { 91 if (ref->object->type == OBJ_TAG) {
92 tag = (struct tag *)ref->object; 92 tag = (struct tag *)ref->object;
93 info = ref->tag; 93 info = ref->tag;
94 if (!tag || !info) 94 if (!tag || !info)
95 return 1; 95 return 1;
96 html("<tr><td>"); 96 html("<tr><td>");
97 url = cgit_pageurl(ctx.qry.repo, "tag", 97 url = cgit_pageurl(ctx.qry.repo, "tag",
98 fmt("id=%s", name)); 98 fmt("id=%s", name));
99 html_link_open(url, NULL, NULL); 99 html_link_open(url, NULL, NULL);
100 html_txt(name); 100 html_txt(name);
101 html_link_close(); 101 html_link_close();
102 html("</td><td>"); 102 html("</td><td>");
103 if (info->tagger_date > 0) 103 if (info->tagger_date > 0)
104 cgit_print_age(info->tagger_date, -1, NULL); 104 cgit_print_age(info->tagger_date, -1, NULL);
105 html("</td><td>"); 105 html("</td><td>");
106 if (info->tagger) 106 if (info->tagger)
107 html(info->tagger); 107 html(info->tagger);
108 html("</td><td>"); 108 html("</td><td>");
109 cgit_object_link(tag->tagged); 109 cgit_object_link(tag->tagged);
110 html("</td></tr>\n"); 110 html("</td></tr>\n");
111 } else { 111 } else {
112 if (!header) 112 if (!header)
113 print_tag_header(); 113 print_tag_header();
114 html("<tr><td>"); 114 html("<tr><td>");
115 html_txt(name); 115 html_txt(name);
116 html("</td><td colspan='2'/><td>"); 116 html("</td><td colspan='2'/><td>");
117 cgit_object_link(ref->object); 117 cgit_object_link(ref->object);
118 html("</td></tr>\n"); 118 html("</td></tr>\n");
119 } 119 }
120 return 0; 120 return 0;
121} 121}
122 122
123static void print_refs_link(char *path) 123static void print_refs_link(char *path)
124{ 124{
125 html("<tr class='nohover'><td colspan='4'>"); 125 html("<tr class='nohover'><td colspan='4'>");
126 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); 126 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
127 html("</td></tr>"); 127 html("</td></tr>");
128} 128}
129 129
130void cgit_print_branches(int maxcount) 130void cgit_print_branches(int maxcount)
131{ 131{
132 struct reflist list; 132 struct reflist list;
133 int i; 133 int i;
134 134
135 html("<tr class='nohover'><th class='left'>Branch</th>" 135 html("<tr class='nohover'><th class='left'>Branch</th>"
136 "<th class='left'>Idle</th>" 136 "<th class='left'>Idle</th>"
137 "<th class='left'>Author</th>" 137 "<th class='left'>Author</th>"
138 "<th class='left'>Head commit</th></tr>\n"); 138 "<th class='left'>Head commit</th></tr>\n");
139 139
140 list.refs = NULL; 140 list.refs = NULL;
141 list.alloc = list.count = 0; 141 list.alloc = list.count = 0;
142 for_each_branch_ref(cgit_refs_cb, &list); 142 for_each_branch_ref(cgit_refs_cb, &list);
143 143
144 if (maxcount == 0 || maxcount > list.count) 144 if (maxcount == 0 || maxcount > list.count)
145 maxcount = list.count; 145 maxcount = list.count;
146 146
147 if (maxcount < list.count) { 147 if (maxcount < list.count) {
148 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); 148 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
149 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); 149 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
150 } 150 }
151 151
152 for(i=0; i<maxcount; i++) 152 for(i=0; i<maxcount; i++)
153 print_branch(list.refs[i]); 153 print_branch(list.refs[i]);
154 154
155 if (maxcount < list.count) 155 if (maxcount < list.count)
156 print_refs_link("heads"); 156 print_refs_link("heads");
157} 157}
158 158
159void cgit_print_tags(int maxcount) 159void cgit_print_tags(int maxcount)
160{ 160{
161 struct reflist list; 161 struct reflist list;
162 int i; 162 int i;
163 163
164 header = 0; 164 header = 0;
165 list.refs = NULL; 165 list.refs = NULL;
166 list.alloc = list.count = 0; 166 list.alloc = list.count = 0;
167 for_each_tag_ref(cgit_refs_cb, &list); 167 for_each_tag_ref(cgit_refs_cb, &list);
168 if (list.count == 0) 168 if (list.count == 0)
169 return; 169 return;
170 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); 170 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
171 if (!maxcount) 171 if (!maxcount)
172 maxcount = list.count; 172 maxcount = list.count;
173 else if (maxcount > list.count) 173 else if (maxcount > list.count)
174 maxcount = list.count; 174 maxcount = list.count;
175 print_tag_header(); 175 print_tag_header();
176 for(i=0; i<maxcount; i++) 176 for(i=0; i<maxcount; i++)
177 print_tag(list.refs[i]); 177 print_tag(list.refs[i]);
178 178
179 if (maxcount < list.count) 179 if (maxcount < list.count)
180 print_refs_link("tags"); 180 print_refs_link("tags");
181} 181}
182 182
183void cgit_print_summary() 183void cgit_print_summary()
184{ 184{
185 if (cgit_repo->readme) { 185 if (ctx.repo->readme) {
186 html("<div id='summary'>"); 186 html("<div id='summary'>");
187 html_include(cgit_repo->readme); 187 html_include(ctx.repo->readme);
188 html("</div>"); 188 html("</div>");
189 } 189 }
190 if (ctx.cfg.summary_log > 0) 190 if (ctx.cfg.summary_log > 0)
191 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, 191 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
192 NULL, NULL, 0); 192 NULL, NULL, 0);
193 html("<table summary='repository info' class='list nowrap'>"); 193 html("<table summary='repository info' class='list nowrap'>");
194 if (ctx.cfg.summary_log > 0) 194 if (ctx.cfg.summary_log > 0)
195 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 195 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
196 cgit_print_branches(ctx.cfg.summary_branches); 196 cgit_print_branches(ctx.cfg.summary_branches);
197 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 197 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
198 cgit_print_tags(ctx.cfg.summary_tags); 198 cgit_print_tags(ctx.cfg.summary_tags);
199 html("</table>"); 199 html("</table>");
200} 200}
diff --git a/ui-tree.c b/ui-tree.c
index 7cae85a..df05ad3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,182 +1,182 @@
1/* ui-tree.c: functions for tree output 1/* ui-tree.c: functions for tree output
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
11char *curr_rev; 11char *curr_rev;
12char *match_path; 12char *match_path;
13int header = 0; 13int header = 0;
14 14
15static void print_object(const unsigned char *sha1, char *path) 15static void print_object(const unsigned char *sha1, char *path)
16{ 16{
17 enum object_type type; 17 enum object_type type;
18 char *buf; 18 char *buf;
19 unsigned long size, lineno, start, idx; 19 unsigned long size, lineno, start, idx;
20 const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; 20 const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
21 21
22 type = sha1_object_info(sha1, &size); 22 type = sha1_object_info(sha1, &size);
23 if (type == OBJ_BAD) { 23 if (type == OBJ_BAD) {
24 cgit_print_error(fmt("Bad object name: %s", 24 cgit_print_error(fmt("Bad object name: %s",
25 sha1_to_hex(sha1))); 25 sha1_to_hex(sha1)));
26 return; 26 return;
27 } 27 }
28 28
29 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 30 if (!buf) {
31 cgit_print_error(fmt("Error reading object %s", 31 cgit_print_error(fmt("Error reading object %s",
32 sha1_to_hex(sha1))); 32 sha1_to_hex(sha1)));
33 return; 33 return;
34 } 34 }
35 35
36 html(" blob: <a href='"); 36 html(" blob: <a href='");
37 html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); 37 html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
38 htmlf("'>%s</a>",sha1_to_hex(sha1)); 38 htmlf("'>%s</a>",sha1_to_hex(sha1));
39 39
40 html("<table summary='blob content' class='blob'>\n"); 40 html("<table summary='blob content' class='blob'>\n");
41 idx = 0; 41 idx = 0;
42 start = 0; 42 start = 0;
43 lineno = 0; 43 lineno = 0;
44 while(idx < size) { 44 while(idx < size) {
45 if (buf[idx] == '\n') { 45 if (buf[idx] == '\n') {
46 buf[idx] = '\0'; 46 buf[idx] = '\0';
47 htmlf(linefmt, ++lineno); 47 htmlf(linefmt, ++lineno);
48 html_txt(buf + start); 48 html_txt(buf + start);
49 html("</td></tr>\n"); 49 html("</td></tr>\n");
50 start = idx + 1; 50 start = idx + 1;
51 } 51 }
52 idx++; 52 idx++;
53 } 53 }
54 htmlf(linefmt, ++lineno); 54 htmlf(linefmt, ++lineno);
55 html_txt(buf + start); 55 html_txt(buf + start);
56 html("</td></tr>\n"); 56 html("</td></tr>\n");
57 html("</table>\n"); 57 html("</table>\n");
58} 58}
59 59
60 60
61static int ls_item(const unsigned char *sha1, const char *base, int baselen, 61static int ls_item(const unsigned char *sha1, const char *base, int baselen,
62 const char *pathname, unsigned int mode, int stage) 62 const char *pathname, unsigned int mode, int stage)
63{ 63{
64 char *name; 64 char *name;
65 char *fullpath; 65 char *fullpath;
66 enum object_type type; 66 enum object_type type;
67 unsigned long size = 0; 67 unsigned long size = 0;
68 68
69 name = xstrdup(pathname); 69 name = xstrdup(pathname);
70 fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", 70 fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
71 ctx.qry.path ? "/" : "", name); 71 ctx.qry.path ? "/" : "", name);
72 72
73 type = sha1_object_info(sha1, &size); 73 type = sha1_object_info(sha1, &size);
74 if (type == OBJ_BAD && !S_ISGITLINK(mode)) { 74 if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
75 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 75 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
76 name, 76 name,
77 sha1_to_hex(sha1)); 77 sha1_to_hex(sha1));
78 return 0; 78 return 0;
79 } 79 }
80 80
81 html("<tr><td class='ls-mode'>"); 81 html("<tr><td class='ls-mode'>");
82 html_filemode(mode); 82 html_filemode(mode);
83 html("</td><td>"); 83 html("</td><td>");
84 if (S_ISGITLINK(mode)) { 84 if (S_ISGITLINK(mode)) {
85 htmlf("<a class='ls-mod' href='"); 85 htmlf("<a class='ls-mod' href='");
86 html_attr(fmt(cgit_repo->module_link, 86 html_attr(fmt(ctx.repo->module_link,
87 name, 87 name,
88 sha1_to_hex(sha1))); 88 sha1_to_hex(sha1)));
89 html("'>"); 89 html("'>");
90 html_txt(name); 90 html_txt(name);
91 html("</a>"); 91 html("</a>");
92 } else if (S_ISDIR(mode)) { 92 } else if (S_ISDIR(mode)) {
93 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, 93 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
94 curr_rev, fullpath); 94 curr_rev, fullpath);
95 } else { 95 } else {
96 cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, 96 cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
97 curr_rev, fullpath); 97 curr_rev, fullpath);
98 } 98 }
99 htmlf("</td><td class='ls-size'>%li</td>", size); 99 htmlf("</td><td class='ls-size'>%li</td>", size);
100 100
101 html("<td>"); 101 html("<td>");
102 cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, 102 cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
103 fullpath, 0, NULL, NULL); 103 fullpath, 0, NULL, NULL);
104 html("</td></tr>\n"); 104 html("</td></tr>\n");
105 free(name); 105 free(name);
106 return 0; 106 return 0;
107} 107}
108 108
109static void ls_head() 109static void ls_head()
110{ 110{
111 html("<table summary='tree listing' class='list'>\n"); 111 html("<table summary='tree listing' class='list'>\n");
112 html("<tr class='nohover'>"); 112 html("<tr class='nohover'>");
113 html("<th class='left'>Mode</th>"); 113 html("<th class='left'>Mode</th>");
114 html("<th class='left'>Name</th>"); 114 html("<th class='left'>Name</th>");
115 html("<th class='right'>Size</th>"); 115 html("<th class='right'>Size</th>");
116 html("<th/>"); 116 html("<th/>");
117 html("</tr>\n"); 117 html("</tr>\n");
118 header = 1; 118 header = 1;
119} 119}
120 120
121static void ls_tail() 121static void ls_tail()
122{ 122{
123 if (!header) 123 if (!header)
124 return; 124 return;
125 html("</table>\n"); 125 html("</table>\n");
126 header = 0; 126 header = 0;
127} 127}
128 128
129static void ls_tree(const unsigned char *sha1, char *path) 129static void ls_tree(const unsigned char *sha1, char *path)
130{ 130{
131 struct tree *tree; 131 struct tree *tree;
132 132
133 tree = parse_tree_indirect(sha1); 133 tree = parse_tree_indirect(sha1);
134 if (!tree) { 134 if (!tree) {
135 cgit_print_error(fmt("Not a tree object: %s", 135 cgit_print_error(fmt("Not a tree object: %s",
136 sha1_to_hex(sha1))); 136 sha1_to_hex(sha1)));
137 return; 137 return;
138 } 138 }
139 139
140 ls_head(); 140 ls_head();
141 read_tree_recursive(tree, "", 0, 1, NULL, ls_item); 141 read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
142 ls_tail(); 142 ls_tail();
143} 143}
144 144
145 145
146static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 146static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
147 const char *pathname, unsigned mode, int stage) 147 const char *pathname, unsigned mode, int stage)
148{ 148{
149 static int state; 149 static int state;
150 static char buffer[PATH_MAX]; 150 static char buffer[PATH_MAX];
151 char *url; 151 char *url;
152 152
153 if (state == 0) { 153 if (state == 0) {
154 memcpy(buffer, base, baselen); 154 memcpy(buffer, base, baselen);
155 strcpy(buffer+baselen, pathname); 155 strcpy(buffer+baselen, pathname);
156 url = cgit_pageurl(ctx.qry.repo, "tree", 156 url = cgit_pageurl(ctx.qry.repo, "tree",
157 fmt("h=%s&amp;path=%s", curr_rev, buffer)); 157 fmt("h=%s&amp;path=%s", curr_rev, buffer));
158 html("/"); 158 html("/");
159 cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, 159 cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
160 curr_rev, buffer); 160 curr_rev, buffer);
161 161
162 if (strcmp(match_path, buffer)) 162 if (strcmp(match_path, buffer))
163 return READ_TREE_RECURSIVE; 163 return READ_TREE_RECURSIVE;
164 164
165 if (S_ISDIR(mode)) { 165 if (S_ISDIR(mode)) {
166 state = 1; 166 state = 1;
167 ls_head(); 167 ls_head();
168 return READ_TREE_RECURSIVE; 168 return READ_TREE_RECURSIVE;
169 } else { 169 } else {
170 print_object(sha1, buffer); 170 print_object(sha1, buffer);
171 return 0; 171 return 0;
172 } 172 }
173 } 173 }
174 ls_item(sha1, base, baselen, pathname, mode, stage); 174 ls_item(sha1, base, baselen, pathname, mode, stage);
175 return 0; 175 return 0;
176} 176}
177 177
178 178
179/* 179/*
180 * Show a tree or a blob 180 * Show a tree or a blob
181 * rev: the commit pointing at the root tree object 181 * rev: the commit pointing at the root tree object
182 * path: path to tree or blob 182 * path: path to tree or blob