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) (side-by-side diff)
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 @@
+CGIT_VERSION = 0.1-pre
INSTALL_BIN = /var/www/htdocs/cgit.cgi
INSTALL_CSS = /var/www/htdocs/cgit.css
EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = cgit.o config.o html.o cache.o
+OBJECTS = config.o html.o cache.o
CFLAGS += -Wall
all: cgit
install: all
install cgit $(INSTALL_BIN)
install cgit.css $(INSTALL_CSS)
-clean:
- rm -f cgit *.o
-
-cgit: $(OBJECTS)
- $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+cgit: cgit.c cgit.h git.h $(OBJECTS)
+ $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
$(OBJECTS): cgit.h git.h
+
+.PHONY: clean
+clean:
+ rm -f cgit *.o
diff --git a/cgit.c b/cgit.c
index 808ffe9..110face 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,66 +1,68 @@
/* cgit.c: cgi for the git scm
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
-static const char cgit_doctype[] =
+const char cgit_version[] = CGIT_VERSION;
+
+const char cgit_doctype[] =
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
-static const char cgit_error[] =
+const char cgit_error[] =
"<div class='error'>%s</div>";
-static const char cgit_lib_error[] =
+const char cgit_lib_error[] =
"<div class='error'>%s: %s</div>";
int htmlfd = 0;
char *cgit_root = "/usr/src/git";
char *cgit_root_title = "Git repository browser";
char *cgit_css = "/cgit.css";
char *cgit_logo = "/git-logo.png";
char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
char *cgit_virtual_root = NULL;
char *cgit_cache_root = "/var/cache/cgit";
int cgit_cache_root_ttl = 5;
int cgit_cache_repo_ttl = 5;
int cgit_cache_dynamic_ttl = 5;
int cgit_cache_static_ttl = -1;
int cgit_cache_max_create_time = 5;
char *cgit_repo_name = NULL;
char *cgit_repo_desc = NULL;
char *cgit_repo_owner = NULL;
int cgit_query_has_symref = 0;
int cgit_query_has_sha1 = 0;
char *cgit_querystring = NULL;
char *cgit_query_repo = NULL;
char *cgit_query_page = NULL;
char *cgit_query_head = NULL;
char *cgit_query_sha1 = NULL;
struct cacheitem cacheitem;
int cgit_parse_query(char *txt, configfn fn)
{
char *t, *value = NULL, c;
if (!txt)
return 0;
t = txt = xstrdup(txt);
while((c=*t) != '\0') {
if (c=='=') {
*t = '\0';
value = t+1;
} else if (c=='&') {
@@ -155,96 +157,97 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
html("</td><td>");
pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
sizeof(buf), 0, NULL, NULL, 0);
html_txt(buf);
html("</td></tr>\n");
} else {
html("<tr><td>");
html_txt(buf);
html("</td><td>");
htmlf("*** bad ref %s", sha1_to_hex(sha1));
html("</td></tr>\n");
}
return 0;
}
/* Sun, 06 Nov 1994 08:49:37 GMT */
static char *http_date(time_t t)
{
static char day[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
struct tm *tm = gmtime(&t);
return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
tm->tm_hour, tm->tm_min, tm->tm_sec);
}
static int ttl_seconds(int ttl)
{
if (ttl<0)
return 60 * 60 * 24 * 365;
else
return ttl * 60;
}
static void cgit_print_docstart(char *title)
{
html("Content-Type: text/html; charset=utf-8\n");
htmlf("Last-Modified: %s\n", http_date(cacheitem.st.st_mtime));
htmlf("Expires: %s\n", http_date(cacheitem.st.st_mtime +
ttl_seconds(cacheitem.ttl)));
html("\n");
html(cgit_doctype);
html("<html>\n");
html("<head>\n");
html("<title>");
html_txt(title);
html("</title>\n");
+ htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
html("<link rel='stylesheet' type='text/css' href='");
html_attr(cgit_css);
html("'/>\n");
html("</head>\n");
html("<body>\n");
}
static void cgit_print_docend()
{
html("</body>\n</html>\n");
}
static void cgit_print_pageheader(char *title)
{
html("<div id='header'>");
htmlf("<a href='%s'>", cgit_logo_link);
htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
htmlf("</a>");
html_txt(title);
html("</div>");
}
static void cgit_print_repolist()
{
DIR *d;
struct dirent *de;
struct stat st;
char *name;
chdir(cgit_root);
cgit_print_docstart(cgit_root_title);
cgit_print_pageheader(cgit_root_title);
if (!(d = opendir("."))) {
htmlf(cgit_lib_error, "Unable to scan repository directory",
strerror(errno));
cgit_print_docend();
return;
}
html("<h2>Repositories</h2>\n");
html("<table class='list'>");
html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n");
while ((de = readdir(d)) != NULL) {
if (de->d_name[0] == '.')
continue;
if (stat(de->d_name, &st) < 0)
continue;