author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 22:48:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 22:48:31 (UTC) |
commit | ea2831f1c826d92c0158474c2d07837ec2f9fd6c (patch) (unidiff) | |
tree | e8d6a89bf0f50835f9c86dd642e7906e1d050df7 | |
parent | 6fb7d09fea94b3dd6932469283358cb24f1e7e29 (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 4 |
5 files changed, 9 insertions, 4 deletions
@@ -1,31 +1,33 @@ | |||
1 | CGIT_VERSION = 0.4 | 1 | CGIT_VERSION = 0.4 |
2 | 2 | ||
3 | prefix = /var/www/htdocs/cgit | 3 | prefix = /var/www/htdocs/cgit |
4 | 4 | ||
5 | SHA1_HEADER = <openssl/sha.h> | 5 | SHA1_HEADER = <openssl/sha.h> |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | CGIT_CONFIG = /etc/cgitrc | 7 | CGIT_CONFIG = /etc/cgitrc |
8 | CGIT_SCRIPT_NAME = cgit.cgi | ||
8 | 9 | ||
9 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 10 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
10 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 11 | OBJECTS = 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 | ||
14 | CFLAGS += -Wall | 15 | CFLAGS += -Wall |
15 | 16 | ||
16 | ifdef DEBUG | 17 | ifdef DEBUG |
17 | CFLAGS += -g | 18 | CFLAGS += -g |
18 | endif | 19 | endif |
19 | 20 | ||
20 | CFLAGS += -Igit | 21 | CFLAGS += -Igit |
21 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 22 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
22 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 23 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
23 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 24 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
25 | CFLAGS += -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 | # |
31 | GITVER = $(shell git version 2>/dev/null || echo nogit) | 33 | GITVER = $(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 | # |
57 | install: all clean-cache | 59 | install: 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 | ||
63 | clean-cgit: | 65 | clean-cgit: |
64 | rm -f cgit *.o | 66 | rm -f cgit *.o |
65 | 67 | ||
66 | distclean-cgit: clean-cgit | 68 | distclean-cgit: clean-cgit |
67 | git clean -d -x | 69 | git clean -d -x |
@@ -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); |
@@ -70,16 +70,17 @@ extern struct repolist cgit_repolist; | |||
70 | extern struct repoinfo *cgit_repo; | 70 | extern struct repoinfo *cgit_repo; |
71 | 71 | ||
72 | extern char *cgit_root_title; | 72 | extern char *cgit_root_title; |
73 | extern char *cgit_css; | 73 | extern char *cgit_css; |
74 | extern char *cgit_logo; | 74 | extern char *cgit_logo; |
75 | extern char *cgit_logo_link; | 75 | extern char *cgit_logo_link; |
76 | extern char *cgit_module_link; | 76 | extern char *cgit_module_link; |
77 | extern char *cgit_virtual_root; | 77 | extern char *cgit_virtual_root; |
78 | extern char *cgit_script_name; | ||
78 | extern char *cgit_cache_root; | 79 | extern char *cgit_cache_root; |
79 | 80 | ||
80 | extern int cgit_nocache; | 81 | extern int cgit_nocache; |
81 | extern int cgit_snapshots; | 82 | extern int cgit_snapshots; |
82 | extern int cgit_max_lock_attempts; | 83 | extern int cgit_max_lock_attempts; |
83 | extern int cgit_cache_root_ttl; | 84 | extern int cgit_cache_root_ttl; |
84 | extern int cgit_cache_repo_ttl; | 85 | extern int cgit_cache_repo_ttl; |
85 | extern int cgit_cache_dynamic_ttl; | 86 | extern int cgit_cache_dynamic_ttl; |
@@ -12,17 +12,17 @@ struct repolist cgit_repolist; | |||
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | 13 | ||
14 | char *cgit_root_title = "Git repository browser"; | 14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
20 | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 22 | ||
23 | int cgit_nocache = 0; | 23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 24 | int cgit_snapshots = 0; |
25 | int cgit_max_lock_attempts = 5; | 25 | int cgit_max_lock_attempts = 5; |
26 | int cgit_cache_root_ttl = 5; | 26 | int cgit_cache_root_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; | 27 | int cgit_cache_repo_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; | 28 | int 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 | ||
43 | char *cgit_rooturl() | 43 | char *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 | ||
51 | char *cgit_repourl(const char *reponame) | 51 | char *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 | ||
71 | char *cgit_currurl() | 71 | char *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 | ||