summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2006-12-10 22:50:16 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-10 22:54:45 (UTC)
commit76827d8679d1d2bd46e8cddf7da2ce4178e1d676 (patch) (unidiff)
treefd098df26c13d87005a000de0a38ef97c73d04c4
parent7640d90b73c01b16bb04ce4c541f52cbaae5f82a (diff)
downloadcgit-76827d8679d1d2bd46e8cddf7da2ce4178e1d676.zip
cgit-76827d8679d1d2bd46e8cddf7da2ce4178e1d676.tar.gz
cgit-76827d8679d1d2bd46e8cddf7da2ce4178e1d676.tar.bz2
Add version identifier in generated files
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile14
-rw-r--r--cgit.c9
2 files changed, 14 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 243f590..21e2eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,24 @@
1CGIT_VERSION = 0.1-pre
1 2
2INSTALL_BIN = /var/www/htdocs/cgit.cgi 3INSTALL_BIN = /var/www/htdocs/cgit.cgi
3INSTALL_CSS = /var/www/htdocs/cgit.css 4INSTALL_CSS = /var/www/htdocs/cgit.css
4 5
5EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto 6EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
6OBJECTS = cgit.o config.o html.o cache.o 7OBJECTS = config.o html.o cache.o
7 8
8CFLAGS += -Wall 9CFLAGS += -Wall
9 10
10all: cgit 11all: cgit
11 12
12install: all 13install: all
13 install cgit $(INSTALL_BIN) 14 install cgit $(INSTALL_BIN)
14 install cgit.css $(INSTALL_CSS) 15 install cgit.css $(INSTALL_CSS)
15 16
16clean: 17cgit: cgit.c cgit.h git.h $(OBJECTS)
17 rm -f cgit *.o 18 $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
18
19cgit: $(OBJECTS)
20 $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
21 19
22$(OBJECTS): cgit.h git.h 20$(OBJECTS): cgit.h git.h
21
22.PHONY: clean
23clean:
24 rm -f cgit *.o
diff --git a/cgit.c b/cgit.c
index 808ffe9..110face 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,298 +1,301 @@
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 const char cgit_doctype[] = 11const char cgit_version[] = CGIT_VERSION;
12
13const char cgit_doctype[] =
12"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
13" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
14 16
15static const char cgit_error[] = 17const char cgit_error[] =
16"<div class='error'>%s</div>"; 18"<div class='error'>%s</div>";
17 19
18static const char cgit_lib_error[] = 20const char cgit_lib_error[] =
19"<div class='error'>%s: %s</div>"; 21"<div class='error'>%s: %s</div>";
20 22
21int htmlfd = 0; 23int htmlfd = 0;
22 24
23char *cgit_root = "/usr/src/git"; 25char *cgit_root = "/usr/src/git";
24char *cgit_root_title = "Git repository browser"; 26char *cgit_root_title = "Git repository browser";
25char *cgit_css = "/cgit.css"; 27char *cgit_css = "/cgit.css";
26char *cgit_logo = "/git-logo.png"; 28char *cgit_logo = "/git-logo.png";
27char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 29char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
28char *cgit_virtual_root = NULL; 30char *cgit_virtual_root = NULL;
29 31
30char *cgit_cache_root = "/var/cache/cgit"; 32char *cgit_cache_root = "/var/cache/cgit";
31 33
32int cgit_cache_root_ttl = 5; 34int cgit_cache_root_ttl = 5;
33int cgit_cache_repo_ttl = 5; 35int cgit_cache_repo_ttl = 5;
34int cgit_cache_dynamic_ttl = 5; 36int cgit_cache_dynamic_ttl = 5;
35int cgit_cache_static_ttl = -1; 37int cgit_cache_static_ttl = -1;
36int cgit_cache_max_create_time = 5; 38int cgit_cache_max_create_time = 5;
37 39
38char *cgit_repo_name = NULL; 40char *cgit_repo_name = NULL;
39char *cgit_repo_desc = NULL; 41char *cgit_repo_desc = NULL;
40char *cgit_repo_owner = NULL; 42char *cgit_repo_owner = NULL;
41 43
42int cgit_query_has_symref = 0; 44int cgit_query_has_symref = 0;
43int cgit_query_has_sha1 = 0; 45int cgit_query_has_sha1 = 0;
44 46
45char *cgit_querystring = NULL; 47char *cgit_querystring = NULL;
46char *cgit_query_repo = NULL; 48char *cgit_query_repo = NULL;
47char *cgit_query_page = NULL; 49char *cgit_query_page = NULL;
48char *cgit_query_head = NULL; 50char *cgit_query_head = NULL;
49char *cgit_query_sha1 = NULL; 51char *cgit_query_sha1 = NULL;
50 52
51struct cacheitem cacheitem; 53struct cacheitem cacheitem;
52 54
53int cgit_parse_query(char *txt, configfn fn) 55int cgit_parse_query(char *txt, configfn fn)
54{ 56{
55 char *t, *value = NULL, c; 57 char *t, *value = NULL, c;
56 58
57 if (!txt) 59 if (!txt)
58 return 0; 60 return 0;
59 61
60 t = txt = xstrdup(txt); 62 t = txt = xstrdup(txt);
61 63
62 while((c=*t) != '\0') { 64 while((c=*t) != '\0') {
63 if (c=='=') { 65 if (c=='=') {
64 *t = '\0'; 66 *t = '\0';
65 value = t+1; 67 value = t+1;
66 } else if (c=='&') { 68 } else if (c=='&') {
67 *t = '\0'; 69 *t = '\0';
68 (*fn)(txt, value); 70 (*fn)(txt, value);
69 txt = t+1; 71 txt = t+1;
70 value = NULL; 72 value = NULL;
71 } 73 }
72 t++; 74 t++;
73 } 75 }
74 if (t!=txt) 76 if (t!=txt)
75 (*fn)(txt, value); 77 (*fn)(txt, value);
76 return 0; 78 return 0;
77} 79}
78 80
79void cgit_global_config_cb(const char *name, const char *value) 81void cgit_global_config_cb(const char *name, const char *value)
80{ 82{
81 if (!strcmp(name, "root")) 83 if (!strcmp(name, "root"))
82 cgit_root = xstrdup(value); 84 cgit_root = xstrdup(value);
83 else if (!strcmp(name, "root-title")) 85 else if (!strcmp(name, "root-title"))
84 cgit_root_title = xstrdup(value); 86 cgit_root_title = xstrdup(value);
85 else if (!strcmp(name, "css")) 87 else if (!strcmp(name, "css"))
86 cgit_css = xstrdup(value); 88 cgit_css = xstrdup(value);
87 else if (!strcmp(name, "logo")) 89 else if (!strcmp(name, "logo"))
88 cgit_logo = xstrdup(value); 90 cgit_logo = xstrdup(value);
89 else if (!strcmp(name, "logo-link")) 91 else if (!strcmp(name, "logo-link"))
90 cgit_logo_link = xstrdup(value); 92 cgit_logo_link = xstrdup(value);
91 else if (!strcmp(name, "virtual-root")) 93 else if (!strcmp(name, "virtual-root"))
92 cgit_virtual_root = xstrdup(value); 94 cgit_virtual_root = xstrdup(value);
93} 95}
94 96
95void cgit_repo_config_cb(const char *name, const char *value) 97void cgit_repo_config_cb(const char *name, const char *value)
96{ 98{
97 if (!strcmp(name, "name")) 99 if (!strcmp(name, "name"))
98 cgit_repo_name = xstrdup(value); 100 cgit_repo_name = xstrdup(value);
99 else if (!strcmp(name, "desc")) 101 else if (!strcmp(name, "desc"))
100 cgit_repo_desc = xstrdup(value); 102 cgit_repo_desc = xstrdup(value);
101 else if (!strcmp(name, "owner")) 103 else if (!strcmp(name, "owner"))
102 cgit_repo_owner = xstrdup(value); 104 cgit_repo_owner = xstrdup(value);
103} 105}
104 106
105void cgit_querystring_cb(const char *name, const char *value) 107void cgit_querystring_cb(const char *name, const char *value)
106{ 108{
107 if (!strcmp(name,"r")) 109 if (!strcmp(name,"r"))
108 cgit_query_repo = xstrdup(value); 110 cgit_query_repo = xstrdup(value);
109 else if (!strcmp(name, "p")) 111 else if (!strcmp(name, "p"))
110 cgit_query_page = xstrdup(value); 112 cgit_query_page = xstrdup(value);
111 else if (!strcmp(name, "h")) { 113 else if (!strcmp(name, "h")) {
112 cgit_query_head = xstrdup(value); 114 cgit_query_head = xstrdup(value);
113 cgit_query_has_symref = 1; 115 cgit_query_has_symref = 1;
114 } else if (!strcmp(name, "id")) { 116 } else if (!strcmp(name, "id")) {
115 cgit_query_sha1 = xstrdup(value); 117 cgit_query_sha1 = xstrdup(value);
116 cgit_query_has_sha1 = 1; 118 cgit_query_has_sha1 = 1;
117 } 119 }
118} 120}
119 121
120char *cgit_repourl(const char *reponame) 122char *cgit_repourl(const char *reponame)
121{ 123{
122 if (cgit_virtual_root) { 124 if (cgit_virtual_root) {
123 return fmt("%s/%s/", cgit_virtual_root, reponame); 125 return fmt("%s/%s/", cgit_virtual_root, reponame);
124 } else { 126 } else {
125 return fmt("?r=%s", reponame); 127 return fmt("?r=%s", reponame);
126 } 128 }
127} 129}
128 130
129char *cgit_pageurl(const char *reponame, const char *pagename, 131char *cgit_pageurl(const char *reponame, const char *pagename,
130 const char *query) 132 const char *query)
131{ 133{
132 if (cgit_virtual_root) { 134 if (cgit_virtual_root) {
133 return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, 135 return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
134 pagename, query); 136 pagename, query);
135 } else { 137 } else {
136 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 138 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
137 } 139 }
138} 140}
139 141
140static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 142static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
141 int flags, void *cb_data) 143 int flags, void *cb_data)
142{ 144{
143 struct commit *commit; 145 struct commit *commit;
144 char buf[256], *url; 146 char buf[256], *url;
145 147
146 commit = lookup_commit(sha1); 148 commit = lookup_commit(sha1);
147 if (commit && !parse_commit(commit)){ 149 if (commit && !parse_commit(commit)){
148 html("<tr><td>"); 150 html("<tr><td>");
149 url = cgit_pageurl(cgit_query_repo, "log", 151 url = cgit_pageurl(cgit_query_repo, "log",
150 fmt("h=%s", refname)); 152 fmt("h=%s", refname));
151 html_link_open(url, NULL, NULL); 153 html_link_open(url, NULL, NULL);
152 strncpy(buf, refname, sizeof(buf)); 154 strncpy(buf, refname, sizeof(buf));
153 html_txt(buf); 155 html_txt(buf);
154 html_link_close(); 156 html_link_close();
155 html("</td><td>"); 157 html("</td><td>");
156 pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, 158 pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
157 sizeof(buf), 0, NULL, NULL, 0); 159 sizeof(buf), 0, NULL, NULL, 0);
158 html_txt(buf); 160 html_txt(buf);
159 html("</td></tr>\n"); 161 html("</td></tr>\n");
160 } else { 162 } else {
161 html("<tr><td>"); 163 html("<tr><td>");
162 html_txt(buf); 164 html_txt(buf);
163 html("</td><td>"); 165 html("</td><td>");
164 htmlf("*** bad ref %s", sha1_to_hex(sha1)); 166 htmlf("*** bad ref %s", sha1_to_hex(sha1));
165 html("</td></tr>\n"); 167 html("</td></tr>\n");
166 } 168 }
167 return 0; 169 return 0;
168} 170}
169 171
170/* Sun, 06 Nov 1994 08:49:37 GMT */ 172/* Sun, 06 Nov 1994 08:49:37 GMT */
171static char *http_date(time_t t) 173static char *http_date(time_t t)
172{ 174{
173 static char day[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 175 static char day[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
174 static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 176 static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
175 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 177 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
176 struct tm *tm = gmtime(&t); 178 struct tm *tm = gmtime(&t);
177 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 179 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
178 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 180 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
179 tm->tm_hour, tm->tm_min, tm->tm_sec); 181 tm->tm_hour, tm->tm_min, tm->tm_sec);
180} 182}
181 183
182static int ttl_seconds(int ttl) 184static int ttl_seconds(int ttl)
183{ 185{
184 if (ttl<0) 186 if (ttl<0)
185 return 60 * 60 * 24 * 365; 187 return 60 * 60 * 24 * 365;
186 else 188 else
187 return ttl * 60; 189 return ttl * 60;
188} 190}
189 191
190static void cgit_print_docstart(char *title) 192static void cgit_print_docstart(char *title)
191{ 193{
192 html("Content-Type: text/html; charset=utf-8\n"); 194 html("Content-Type: text/html; charset=utf-8\n");
193 htmlf("Last-Modified: %s\n", http_date(cacheitem.st.st_mtime)); 195 htmlf("Last-Modified: %s\n", http_date(cacheitem.st.st_mtime));
194 htmlf("Expires: %s\n", http_date(cacheitem.st.st_mtime + 196 htmlf("Expires: %s\n", http_date(cacheitem.st.st_mtime +
195 ttl_seconds(cacheitem.ttl))); 197 ttl_seconds(cacheitem.ttl)));
196 html("\n"); 198 html("\n");
197 html(cgit_doctype); 199 html(cgit_doctype);
198 html("<html>\n"); 200 html("<html>\n");
199 html("<head>\n"); 201 html("<head>\n");
200 html("<title>"); 202 html("<title>");
201 html_txt(title); 203 html_txt(title);
202 html("</title>\n"); 204 html("</title>\n");
205 htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
203 html("<link rel='stylesheet' type='text/css' href='"); 206 html("<link rel='stylesheet' type='text/css' href='");
204 html_attr(cgit_css); 207 html_attr(cgit_css);
205 html("'/>\n"); 208 html("'/>\n");
206 html("</head>\n"); 209 html("</head>\n");
207 html("<body>\n"); 210 html("<body>\n");
208} 211}
209 212
210static void cgit_print_docend() 213static void cgit_print_docend()
211{ 214{
212 html("</body>\n</html>\n"); 215 html("</body>\n</html>\n");
213} 216}
214 217
215static void cgit_print_pageheader(char *title) 218static void cgit_print_pageheader(char *title)
216{ 219{
217 html("<div id='header'>"); 220 html("<div id='header'>");
218 htmlf("<a href='%s'>", cgit_logo_link); 221 htmlf("<a href='%s'>", cgit_logo_link);
219 htmlf("<img id='logo' src='%s'/>\n", cgit_logo); 222 htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
220 htmlf("</a>"); 223 htmlf("</a>");
221 html_txt(title); 224 html_txt(title);
222 html("</div>"); 225 html("</div>");
223} 226}
224 227
225static void cgit_print_repolist() 228static void cgit_print_repolist()
226{ 229{
227 DIR *d; 230 DIR *d;
228 struct dirent *de; 231 struct dirent *de;
229 struct stat st; 232 struct stat st;
230 char *name; 233 char *name;
231 234
232 chdir(cgit_root); 235 chdir(cgit_root);
233 cgit_print_docstart(cgit_root_title); 236 cgit_print_docstart(cgit_root_title);
234 cgit_print_pageheader(cgit_root_title); 237 cgit_print_pageheader(cgit_root_title);
235 238
236 if (!(d = opendir("."))) { 239 if (!(d = opendir("."))) {
237 htmlf(cgit_lib_error, "Unable to scan repository directory", 240 htmlf(cgit_lib_error, "Unable to scan repository directory",
238 strerror(errno)); 241 strerror(errno));
239 cgit_print_docend(); 242 cgit_print_docend();
240 return; 243 return;
241 } 244 }
242 245
243 html("<h2>Repositories</h2>\n"); 246 html("<h2>Repositories</h2>\n");
244 html("<table class='list'>"); 247 html("<table class='list'>");
245 html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n"); 248 html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n");
246 while ((de = readdir(d)) != NULL) { 249 while ((de = readdir(d)) != NULL) {
247 if (de->d_name[0] == '.') 250 if (de->d_name[0] == '.')
248 continue; 251 continue;
249 if (stat(de->d_name, &st) < 0) 252 if (stat(de->d_name, &st) < 0)
250 continue; 253 continue;
251 if (!S_ISDIR(st.st_mode)) 254 if (!S_ISDIR(st.st_mode))
252 continue; 255 continue;
253 256
254 cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL; 257 cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL;
255 name = fmt("%s/info/cgit", de->d_name); 258 name = fmt("%s/info/cgit", de->d_name);
256 if (cgit_read_config(name, cgit_repo_config_cb)) 259 if (cgit_read_config(name, cgit_repo_config_cb))
257 continue; 260 continue;
258 261
259 html("<tr><td>"); 262 html("<tr><td>");
260 html_link_open(cgit_repourl(de->d_name), NULL, NULL); 263 html_link_open(cgit_repourl(de->d_name), NULL, NULL);
261 html_txt(cgit_repo_name); 264 html_txt(cgit_repo_name);
262 html_link_close(); 265 html_link_close();
263 html("</td><td>"); 266 html("</td><td>");
264 html_txt(cgit_repo_desc); 267 html_txt(cgit_repo_desc);
265 html("</td><td>"); 268 html("</td><td>");
266 html_txt(cgit_repo_owner); 269 html_txt(cgit_repo_owner);
267 html("</td></tr>\n"); 270 html("</td></tr>\n");
268 } 271 }
269 closedir(d); 272 closedir(d);
270 html("</table>"); 273 html("</table>");
271 cgit_print_docend(); 274 cgit_print_docend();
272} 275}
273 276
274static void cgit_print_branches() 277static void cgit_print_branches()
275{ 278{
276 html("<table class='list'>"); 279 html("<table class='list'>");
277 html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); 280 html("<tr><th>Branch name</th><th>Head commit</th></tr>\n");
278 for_each_branch_ref(cgit_print_branch_cb, NULL); 281 for_each_branch_ref(cgit_print_branch_cb, NULL);
279 html("</table>"); 282 html("</table>");
280} 283}
281 284
282static int get_one_line(char *txt) 285static int get_one_line(char *txt)
283{ 286{
284 char *t; 287 char *t;
285 288
286 for(t=txt; *t != '\n' && t != '\0'; t++) 289 for(t=txt; *t != '\n' && t != '\0'; t++)
287 ; 290 ;
288 *t = '\0'; 291 *t = '\0';
289 return t-txt-1; 292 return t-txt-1;
290} 293}
291 294
292static void cgit_print_commit_shortlog(struct commit *commit) 295static void cgit_print_commit_shortlog(struct commit *commit)
293{ 296{
294 char *h, *t, *p; 297 char *h, *t, *p;
295 char *tree = NULL, *author = NULL, *subject = NULL; 298 char *tree = NULL, *author = NULL, *subject = NULL;
296 int len; 299 int len;
297 time_t sec; 300 time_t sec;
298 struct tm *time; 301 struct tm *time;