summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-14 22:48:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-14 22:48:31 (UTC)
commitea2831f1c826d92c0158474c2d07837ec2f9fd6c (patch) (unidiff)
treee8d6a89bf0f50835f9c86dd642e7906e1d050df7
parent6fb7d09fea94b3dd6932469283358cb24f1e7e29 (diff)
downloadcgit-ea2831f1c826d92c0158474c2d07837ec2f9fd6c.zip
cgit-ea2831f1c826d92c0158474c2d07837ec2f9fd6c.tar.gz
cgit-ea2831f1c826d92c0158474c2d07837ec2f9fd6c.tar.bz2
Don't hardcode urls when SCRIPT_NAME is available
Also, let the makefile define the name of the installed cgi and use that definition as a default value for cgit_script_name variable. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--shared.c2
-rw-r--r--ui-shared.c4
5 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3d8edb8..96d68cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,33 @@
1CGIT_VERSION = 0.4 1CGIT_VERSION = 0.4
2 2
3prefix = /var/www/htdocs/cgit 3prefix = /var/www/htdocs/cgit
4 4
5SHA1_HEADER = <openssl/sha.h> 5SHA1_HEADER = <openssl/sha.h>
6CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7CGIT_CONFIG = /etc/cgitrc 7CGIT_CONFIG = /etc/cgitrc
8CGIT_SCRIPT_NAME = cgit.cgi
8 9
9EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 10EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
10OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 11OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
11 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ 12 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
12 ui-snapshot.o ui-blob.o 13 ui-snapshot.o ui-blob.o
13 14
14CFLAGS += -Wall 15CFLAGS += -Wall
15 16
16ifdef DEBUG 17ifdef DEBUG
17 CFLAGS += -g 18 CFLAGS += -g
18endif 19endif
19 20
20CFLAGS += -Igit 21CFLAGS += -Igit
21CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 22CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
22CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 23CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
23CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 24CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
25CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
24 26
25 27
26# 28#
27# If make is run on a nongit platform, we need to get the git sources as a tarball. 29# If make is run on a nongit platform, we need to get the git sources as a tarball.
28# But there is currently no recent enough tarball available on kernel.org, so download 30# But there is currently no recent enough tarball available on kernel.org, so download
29# a zipfile from hjemli.net instead 31# a zipfile from hjemli.net instead
30# 32#
31GITVER = $(shell git version 2>/dev/null || echo nogit) 33GITVER = $(shell git version 2>/dev/null || echo nogit)
@@ -51,17 +53,17 @@ git/libgit.a:
51 $(INITGIT) 53 $(INITGIT)
52 $(MAKE) -C git 54 $(MAKE) -C git
53 55
54# 56#
55# phony targets 57# phony targets
56# 58#
57install: all clean-cache 59install: all clean-cache
58 mkdir -p $(prefix) 60 mkdir -p $(prefix)
59 install cgit $(prefix)/cgit.cgi 61 install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
60 install cgit.css $(prefix)/cgit.css 62 install cgit.css $(prefix)/cgit.css
61 install add.png del.png $(prefix)/ 63 install add.png del.png $(prefix)/
62 64
63clean-cgit: 65clean-cgit:
64 rm -f cgit *.o 66 rm -f cgit *.o
65 67
66distclean-cgit: clean-cgit 68distclean-cgit: clean-cgit
67 git clean -d -x 69 git clean -d -x
diff --git a/cgit.c b/cgit.c
index 67ad103..3c11ff0 100644
--- a/cgit.c
+++ b/cgit.c
@@ -239,16 +239,18 @@ int main(int argc, const char **argv)
239 239
240 htmlfd = STDOUT_FILENO; 240 htmlfd = STDOUT_FILENO;
241 item.st.st_mtime = time(NULL); 241 item.st.st_mtime = time(NULL);
242 cgit_repolist.length = 0; 242 cgit_repolist.length = 0;
243 cgit_repolist.count = 0; 243 cgit_repolist.count = 0;
244 cgit_repolist.repos = NULL; 244 cgit_repolist.repos = NULL;
245 245
246 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); 246 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
247 if (getenv("SCRIPT_NAME"))
248 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
247 if (getenv("QUERY_STRING")) 249 if (getenv("QUERY_STRING"))
248 cgit_querystring = xstrdup(getenv("QUERY_STRING")); 250 cgit_querystring = xstrdup(getenv("QUERY_STRING"));
249 cgit_parse_args(argc, argv); 251 cgit_parse_args(argc, argv);
250 cgit_parse_query(cgit_querystring, cgit_querystring_cb); 252 cgit_parse_query(cgit_querystring, cgit_querystring_cb);
251 if (!cgit_prepare_cache(&item)) 253 if (!cgit_prepare_cache(&item))
252 return 0; 254 return 0;
253 if (cgit_nocache) { 255 if (cgit_nocache) {
254 cgit_fill_cache(&item, 0); 256 cgit_fill_cache(&item, 0);
diff --git a/cgit.h b/cgit.h
index 0fff7b0..f5906ad 100644
--- a/cgit.h
+++ b/cgit.h
@@ -70,16 +70,17 @@ extern struct repolist cgit_repolist;
70extern struct repoinfo *cgit_repo; 70extern struct repoinfo *cgit_repo;
71 71
72extern char *cgit_root_title; 72extern char *cgit_root_title;
73extern char *cgit_css; 73extern char *cgit_css;
74extern char *cgit_logo; 74extern char *cgit_logo;
75extern char *cgit_logo_link; 75extern char *cgit_logo_link;
76extern char *cgit_module_link; 76extern char *cgit_module_link;
77extern char *cgit_virtual_root; 77extern char *cgit_virtual_root;
78extern char *cgit_script_name;
78extern char *cgit_cache_root; 79extern char *cgit_cache_root;
79 80
80extern int cgit_nocache; 81extern int cgit_nocache;
81extern int cgit_snapshots; 82extern int cgit_snapshots;
82extern int cgit_max_lock_attempts; 83extern int cgit_max_lock_attempts;
83extern int cgit_cache_root_ttl; 84extern int cgit_cache_root_ttl;
84extern int cgit_cache_repo_ttl; 85extern int cgit_cache_repo_ttl;
85extern int cgit_cache_dynamic_ttl; 86extern int cgit_cache_dynamic_ttl;
diff --git a/shared.c b/shared.c
index 072bb6d..8505397 100644
--- a/shared.c
+++ b/shared.c
@@ -12,17 +12,17 @@ struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13 13
14char *cgit_root_title = "Git repository browser"; 14char *cgit_root_title = "Git repository browser";
15char *cgit_css = "/cgit.css"; 15char *cgit_css = "/cgit.css";
16char *cgit_logo = "/git-logo.png"; 16char *cgit_logo = "/git-logo.png";
17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
18char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 18char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
19char *cgit_virtual_root = NULL; 19char *cgit_virtual_root = NULL;
20 20char *cgit_script_name = CGIT_SCRIPT_NAME;
21char *cgit_cache_root = "/var/cache/cgit"; 21char *cgit_cache_root = "/var/cache/cgit";
22 22
23int cgit_nocache = 0; 23int cgit_nocache = 0;
24int cgit_snapshots = 0; 24int cgit_snapshots = 0;
25int cgit_max_lock_attempts = 5; 25int cgit_max_lock_attempts = 5;
26int cgit_cache_root_ttl = 5; 26int cgit_cache_root_ttl = 5;
27int cgit_cache_repo_ttl = 5; 27int cgit_cache_repo_ttl = 5;
28int cgit_cache_dynamic_ttl = 5; 28int cgit_cache_dynamic_ttl = 5;
diff --git a/ui-shared.c b/ui-shared.c
index 6f5cf2b..b0cff7d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -40,17 +40,17 @@ void cgit_print_error(char *msg)
40 html("</div>\n"); 40 html("</div>\n");
41} 41}
42 42
43char *cgit_rooturl() 43char *cgit_rooturl()
44{ 44{
45 if (cgit_virtual_root) 45 if (cgit_virtual_root)
46 return fmt("%s/", cgit_virtual_root); 46 return fmt("%s/", cgit_virtual_root);
47 else 47 else
48 return "./cgit.cgi"; 48 return cgit_script_name;
49} 49}
50 50
51char *cgit_repourl(const char *reponame) 51char *cgit_repourl(const char *reponame)
52{ 52{
53 if (cgit_virtual_root) { 53 if (cgit_virtual_root) {
54 return fmt("%s/%s/", cgit_virtual_root, reponame); 54 return fmt("%s/%s/", cgit_virtual_root, reponame);
55 } else { 55 } else {
56 return fmt("?r=%s", reponame); 56 return fmt("?r=%s", reponame);
@@ -66,17 +66,17 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
66 } else { 66 } else {
67 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 67 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
68 } 68 }
69} 69}
70 70
71char *cgit_currurl() 71char *cgit_currurl()
72{ 72{
73 if (!cgit_virtual_root) 73 if (!cgit_virtual_root)
74 return "./cgit.cgi"; 74 return cgit_script_name;
75 else if (cgit_query_page) 75 else if (cgit_query_page)
76 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); 76 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
77 else if (cgit_query_repo) 77 else if (cgit_query_repo)
78 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); 78 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
79 else 79 else
80 return fmt("%s/", cgit_virtual_root); 80 return fmt("%s/", cgit_virtual_root);
81} 81}
82 82