summaryrefslogtreecommitdiffabout
Unidiff
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,34 +1,36 @@
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;
@@ -187,32 +189,33 @@ static int ttl_seconds(int ttl)
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);