-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cgit.c | 1 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cmd.c | 7 | ||||
-rw-r--r-- | html.c | 5 | ||||
-rw-r--r-- | html.h | 1 | ||||
-rw-r--r-- | ui-plain.c | 82 | ||||
-rw-r--r-- | ui-plain.h | 6 | ||||
-rw-r--r-- | ui-shared.c | 2 |
9 files changed, 106 insertions, 0 deletions
@@ -1,125 +1,126 @@ | |||
1 | CGIT_VERSION = v0.7.2 | 1 | CGIT_VERSION = v0.7.2 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.5.6 | 7 | GIT_VER = 1.5.6 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # | 10 | # |
11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
12 | # | 12 | # |
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | # | 15 | # |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
17 | # from git.git | 17 | # from git.git |
18 | # | 18 | # |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
20 | QUIET_SUBDIR1 = | 20 | QUIET_SUBDIR1 = |
21 | 21 | ||
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
23 | PRINT_DIR = --no-print-directory | 23 | PRINT_DIR = --no-print-directory |
24 | else # "make -w" | 24 | else # "make -w" |
25 | NO_SUBDIR = : | 25 | NO_SUBDIR = : |
26 | endif | 26 | endif |
27 | 27 | ||
28 | ifndef V | 28 | ifndef V |
29 | QUIET_CC = @echo ' ' CC $@; | 29 | QUIET_CC = @echo ' ' CC $@; |
30 | QUIET_MM = @echo ' ' MM $@; | 30 | QUIET_MM = @echo ' ' MM $@; |
31 | QUIET_SUBDIR0 = +@subdir= | 31 | QUIET_SUBDIR0 = +@subdir= |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir | 33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
34 | endif | 34 | endif |
35 | 35 | ||
36 | # | 36 | # |
37 | # Define a pattern rule for automatic dependency building | 37 | # Define a pattern rule for automatic dependency building |
38 | # | 38 | # |
39 | %.d: %.c | 39 | %.d: %.c |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | 41 | ||
42 | # | 42 | # |
43 | # Define a pattern rule for silent object building | 43 | # Define a pattern rule for silent object building |
44 | # | 44 | # |
45 | %.o: %.c | 45 | %.o: %.c |
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
47 | 47 | ||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
58 | OBJECTS += ui-blob.o | 58 | OBJECTS += ui-blob.o |
59 | OBJECTS += ui-clone.o | 59 | OBJECTS += ui-clone.o |
60 | OBJECTS += ui-commit.o | 60 | OBJECTS += ui-commit.o |
61 | OBJECTS += ui-diff.o | 61 | OBJECTS += ui-diff.o |
62 | OBJECTS += ui-log.o | 62 | OBJECTS += ui-log.o |
63 | OBJECTS += ui-patch.o | 63 | OBJECTS += ui-patch.o |
64 | OBJECTS += ui-plain.o | ||
64 | OBJECTS += ui-refs.o | 65 | OBJECTS += ui-refs.o |
65 | OBJECTS += ui-repolist.o | 66 | OBJECTS += ui-repolist.o |
66 | OBJECTS += ui-shared.o | 67 | OBJECTS += ui-shared.o |
67 | OBJECTS += ui-snapshot.o | 68 | OBJECTS += ui-snapshot.o |
68 | OBJECTS += ui-summary.o | 69 | OBJECTS += ui-summary.o |
69 | OBJECTS += ui-tag.o | 70 | OBJECTS += ui-tag.o |
70 | OBJECTS += ui-tree.o | 71 | OBJECTS += ui-tree.o |
71 | 72 | ||
72 | ifdef NEEDS_LIBICONV | 73 | ifdef NEEDS_LIBICONV |
73 | EXTLIBS += -liconv | 74 | EXTLIBS += -liconv |
74 | endif | 75 | endif |
75 | 76 | ||
76 | 77 | ||
77 | .PHONY: all git test install uninstall clean force-version get-git | 78 | .PHONY: all git test install uninstall clean force-version get-git |
78 | 79 | ||
79 | all: cgit | 80 | all: cgit |
80 | 81 | ||
81 | VERSION: force-version | 82 | VERSION: force-version |
82 | @./gen-version.sh "$(CGIT_VERSION)" | 83 | @./gen-version.sh "$(CGIT_VERSION)" |
83 | -include VERSION | 84 | -include VERSION |
84 | 85 | ||
85 | 86 | ||
86 | CFLAGS += -g -Wall -Igit | 87 | CFLAGS += -g -Wall -Igit |
87 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 88 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
88 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 89 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
89 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 90 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
90 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 91 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
91 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 92 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
92 | 93 | ||
93 | 94 | ||
94 | cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a | 95 | cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a |
95 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 96 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
96 | 97 | ||
97 | cgit.o: VERSION | 98 | cgit.o: VERSION |
98 | 99 | ||
99 | -include $(OBJECTS:.o=.d) | 100 | -include $(OBJECTS:.o=.d) |
100 | 101 | ||
101 | git/libgit.a: git | 102 | git/libgit.a: git |
102 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | 103 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
103 | 104 | ||
104 | git/xdiff/lib.a: git | 105 | git/xdiff/lib.a: git |
105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 106 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
106 | 107 | ||
107 | test: all | 108 | test: all |
108 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 109 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
109 | 110 | ||
110 | install: all | 111 | install: all |
111 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 112 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
112 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 113 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
113 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 114 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
114 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 115 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
115 | 116 | ||
116 | uninstall: | 117 | uninstall: |
117 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 118 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
118 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 119 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
119 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 120 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
120 | 121 | ||
121 | clean: | 122 | clean: |
122 | rm -f cgit VERSION *.o *.d | 123 | rm -f cgit VERSION *.o *.d |
123 | 124 | ||
124 | get-git: | 125 | get-git: |
125 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 126 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
@@ -1,381 +1,382 @@ | |||
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 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | 15 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | void config_cb(const char *name, const char *value) | 18 | void config_cb(const char *name, const char *value) |
19 | { | 19 | { |
20 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | 22 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 23 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | 24 | else if (!strcmp(name, "root-readme")) |
25 | ctx.cfg.root_readme = xstrdup(value); | 25 | ctx.cfg.root_readme = xstrdup(value); |
26 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "favicon")) | 28 | else if (!strcmp(name, "favicon")) |
29 | ctx.cfg.favicon = xstrdup(value); | 29 | ctx.cfg.favicon = xstrdup(value); |
30 | else if (!strcmp(name, "footer")) | 30 | else if (!strcmp(name, "footer")) |
31 | ctx.cfg.footer = xstrdup(value); | 31 | ctx.cfg.footer = xstrdup(value); |
32 | else if (!strcmp(name, "logo")) | 32 | else if (!strcmp(name, "logo")) |
33 | ctx.cfg.logo = xstrdup(value); | 33 | ctx.cfg.logo = xstrdup(value); |
34 | else if (!strcmp(name, "index-header")) | 34 | else if (!strcmp(name, "index-header")) |
35 | ctx.cfg.index_header = xstrdup(value); | 35 | ctx.cfg.index_header = xstrdup(value); |
36 | else if (!strcmp(name, "index-info")) | 36 | else if (!strcmp(name, "index-info")) |
37 | ctx.cfg.index_info = xstrdup(value); | 37 | ctx.cfg.index_info = xstrdup(value); |
38 | else if (!strcmp(name, "logo-link")) | 38 | else if (!strcmp(name, "logo-link")) |
39 | ctx.cfg.logo_link = xstrdup(value); | 39 | ctx.cfg.logo_link = xstrdup(value); |
40 | else if (!strcmp(name, "module-link")) | 40 | else if (!strcmp(name, "module-link")) |
41 | ctx.cfg.module_link = xstrdup(value); | 41 | ctx.cfg.module_link = xstrdup(value); |
42 | else if (!strcmp(name, "virtual-root")) { | 42 | else if (!strcmp(name, "virtual-root")) { |
43 | ctx.cfg.virtual_root = trim_end(value, '/'); | 43 | ctx.cfg.virtual_root = trim_end(value, '/'); |
44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
45 | ctx.cfg.virtual_root = ""; | 45 | ctx.cfg.virtual_root = ""; |
46 | } else if (!strcmp(name, "nocache")) | 46 | } else if (!strcmp(name, "nocache")) |
47 | ctx.cfg.nocache = atoi(value); | 47 | ctx.cfg.nocache = atoi(value); |
48 | else if (!strcmp(name, "snapshots")) | 48 | else if (!strcmp(name, "snapshots")) |
49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
50 | else if (!strcmp(name, "enable-index-links")) | 50 | else if (!strcmp(name, "enable-index-links")) |
51 | ctx.cfg.enable_index_links = atoi(value); | 51 | ctx.cfg.enable_index_links = atoi(value); |
52 | else if (!strcmp(name, "enable-log-filecount")) | 52 | else if (!strcmp(name, "enable-log-filecount")) |
53 | ctx.cfg.enable_log_filecount = atoi(value); | 53 | ctx.cfg.enable_log_filecount = atoi(value); |
54 | else if (!strcmp(name, "enable-log-linecount")) | 54 | else if (!strcmp(name, "enable-log-linecount")) |
55 | ctx.cfg.enable_log_linecount = atoi(value); | 55 | ctx.cfg.enable_log_linecount = atoi(value); |
56 | else if (!strcmp(name, "cache-size")) | 56 | else if (!strcmp(name, "cache-size")) |
57 | ctx.cfg.cache_size = atoi(value); | 57 | ctx.cfg.cache_size = atoi(value); |
58 | else if (!strcmp(name, "cache-root")) | 58 | else if (!strcmp(name, "cache-root")) |
59 | ctx.cfg.cache_root = xstrdup(value); | 59 | ctx.cfg.cache_root = xstrdup(value); |
60 | else if (!strcmp(name, "cache-root-ttl")) | 60 | else if (!strcmp(name, "cache-root-ttl")) |
61 | ctx.cfg.cache_root_ttl = atoi(value); | 61 | ctx.cfg.cache_root_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-repo-ttl")) | 62 | else if (!strcmp(name, "cache-repo-ttl")) |
63 | ctx.cfg.cache_repo_ttl = atoi(value); | 63 | ctx.cfg.cache_repo_ttl = atoi(value); |
64 | else if (!strcmp(name, "cache-static-ttl")) | 64 | else if (!strcmp(name, "cache-static-ttl")) |
65 | ctx.cfg.cache_static_ttl = atoi(value); | 65 | ctx.cfg.cache_static_ttl = atoi(value); |
66 | else if (!strcmp(name, "cache-dynamic-ttl")) | 66 | else if (!strcmp(name, "cache-dynamic-ttl")) |
67 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 67 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
68 | else if (!strcmp(name, "max-message-length")) | 68 | else if (!strcmp(name, "max-message-length")) |
69 | ctx.cfg.max_msg_len = atoi(value); | 69 | ctx.cfg.max_msg_len = atoi(value); |
70 | else if (!strcmp(name, "max-repodesc-length")) | 70 | else if (!strcmp(name, "max-repodesc-length")) |
71 | ctx.cfg.max_repodesc_len = atoi(value); | 71 | ctx.cfg.max_repodesc_len = atoi(value); |
72 | else if (!strcmp(name, "max-repo-count")) | 72 | else if (!strcmp(name, "max-repo-count")) |
73 | ctx.cfg.max_repo_count = atoi(value); | 73 | ctx.cfg.max_repo_count = atoi(value); |
74 | else if (!strcmp(name, "max-commit-count")) | 74 | else if (!strcmp(name, "max-commit-count")) |
75 | ctx.cfg.max_commit_count = atoi(value); | 75 | ctx.cfg.max_commit_count = atoi(value); |
76 | else if (!strcmp(name, "summary-log")) | 76 | else if (!strcmp(name, "summary-log")) |
77 | ctx.cfg.summary_log = atoi(value); | 77 | ctx.cfg.summary_log = atoi(value); |
78 | else if (!strcmp(name, "summary-branches")) | 78 | else if (!strcmp(name, "summary-branches")) |
79 | ctx.cfg.summary_branches = atoi(value); | 79 | ctx.cfg.summary_branches = atoi(value); |
80 | else if (!strcmp(name, "summary-tags")) | 80 | else if (!strcmp(name, "summary-tags")) |
81 | ctx.cfg.summary_tags = atoi(value); | 81 | ctx.cfg.summary_tags = atoi(value); |
82 | else if (!strcmp(name, "agefile")) | 82 | else if (!strcmp(name, "agefile")) |
83 | ctx.cfg.agefile = xstrdup(value); | 83 | ctx.cfg.agefile = xstrdup(value); |
84 | else if (!strcmp(name, "renamelimit")) | 84 | else if (!strcmp(name, "renamelimit")) |
85 | ctx.cfg.renamelimit = atoi(value); | 85 | ctx.cfg.renamelimit = atoi(value); |
86 | else if (!strcmp(name, "robots")) | 86 | else if (!strcmp(name, "robots")) |
87 | ctx.cfg.robots = xstrdup(value); | 87 | ctx.cfg.robots = xstrdup(value); |
88 | else if (!strcmp(name, "clone-prefix")) | 88 | else if (!strcmp(name, "clone-prefix")) |
89 | ctx.cfg.clone_prefix = xstrdup(value); | 89 | ctx.cfg.clone_prefix = xstrdup(value); |
90 | else if (!strcmp(name, "local-time")) | 90 | else if (!strcmp(name, "local-time")) |
91 | ctx.cfg.local_time = atoi(value); | 91 | ctx.cfg.local_time = atoi(value); |
92 | else if (!strcmp(name, "repo.group")) | 92 | else if (!strcmp(name, "repo.group")) |
93 | ctx.cfg.repo_group = xstrdup(value); | 93 | ctx.cfg.repo_group = xstrdup(value); |
94 | else if (!strcmp(name, "repo.url")) | 94 | else if (!strcmp(name, "repo.url")) |
95 | ctx.repo = cgit_add_repo(value); | 95 | ctx.repo = cgit_add_repo(value); |
96 | else if (!strcmp(name, "repo.name")) | 96 | else if (!strcmp(name, "repo.name")) |
97 | ctx.repo->name = xstrdup(value); | 97 | ctx.repo->name = xstrdup(value); |
98 | else if (ctx.repo && !strcmp(name, "repo.path")) | 98 | else if (ctx.repo && !strcmp(name, "repo.path")) |
99 | ctx.repo->path = trim_end(value, '/'); | 99 | ctx.repo->path = trim_end(value, '/'); |
100 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 100 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
101 | ctx.repo->clone_url = xstrdup(value); | 101 | ctx.repo->clone_url = xstrdup(value); |
102 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 102 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
103 | ctx.repo->desc = xstrdup(value); | 103 | ctx.repo->desc = xstrdup(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 104 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
105 | ctx.repo->owner = xstrdup(value); | 105 | ctx.repo->owner = xstrdup(value); |
106 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 106 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
107 | ctx.repo->defbranch = xstrdup(value); | 107 | ctx.repo->defbranch = xstrdup(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 108 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
109 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 109 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
110 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 110 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
111 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 111 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 112 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
113 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 113 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
114 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 114 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
115 | ctx.repo->module_link= xstrdup(value); | 115 | ctx.repo->module_link= xstrdup(value); |
116 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 116 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
117 | if (*value == '/') | 117 | if (*value == '/') |
118 | ctx.repo->readme = xstrdup(value); | 118 | ctx.repo->readme = xstrdup(value); |
119 | else | 119 | else |
120 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 120 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
121 | } else if (!strcmp(name, "include")) | 121 | } else if (!strcmp(name, "include")) |
122 | parse_configfile(value, config_cb); | 122 | parse_configfile(value, config_cb); |
123 | } | 123 | } |
124 | 124 | ||
125 | static void querystring_cb(const char *name, const char *value) | 125 | static void querystring_cb(const char *name, const char *value) |
126 | { | 126 | { |
127 | if (!strcmp(name,"r")) { | 127 | if (!strcmp(name,"r")) { |
128 | ctx.qry.repo = xstrdup(value); | 128 | ctx.qry.repo = xstrdup(value); |
129 | ctx.repo = cgit_get_repoinfo(value); | 129 | ctx.repo = cgit_get_repoinfo(value); |
130 | } else if (!strcmp(name, "p")) { | 130 | } else if (!strcmp(name, "p")) { |
131 | ctx.qry.page = xstrdup(value); | 131 | ctx.qry.page = xstrdup(value); |
132 | } else if (!strcmp(name, "url")) { | 132 | } else if (!strcmp(name, "url")) { |
133 | cgit_parse_url(value); | 133 | cgit_parse_url(value); |
134 | } else if (!strcmp(name, "qt")) { | 134 | } else if (!strcmp(name, "qt")) { |
135 | ctx.qry.grep = xstrdup(value); | 135 | ctx.qry.grep = xstrdup(value); |
136 | } else if (!strcmp(name, "q")) { | 136 | } else if (!strcmp(name, "q")) { |
137 | ctx.qry.search = xstrdup(value); | 137 | ctx.qry.search = xstrdup(value); |
138 | } else if (!strcmp(name, "h")) { | 138 | } else if (!strcmp(name, "h")) { |
139 | ctx.qry.head = xstrdup(value); | 139 | ctx.qry.head = xstrdup(value); |
140 | ctx.qry.has_symref = 1; | 140 | ctx.qry.has_symref = 1; |
141 | } else if (!strcmp(name, "id")) { | 141 | } else if (!strcmp(name, "id")) { |
142 | ctx.qry.sha1 = xstrdup(value); | 142 | ctx.qry.sha1 = xstrdup(value); |
143 | ctx.qry.has_sha1 = 1; | 143 | ctx.qry.has_sha1 = 1; |
144 | } else if (!strcmp(name, "id2")) { | 144 | } else if (!strcmp(name, "id2")) { |
145 | ctx.qry.sha2 = xstrdup(value); | 145 | ctx.qry.sha2 = xstrdup(value); |
146 | ctx.qry.has_sha1 = 1; | 146 | ctx.qry.has_sha1 = 1; |
147 | } else if (!strcmp(name, "ofs")) { | 147 | } else if (!strcmp(name, "ofs")) { |
148 | ctx.qry.ofs = atoi(value); | 148 | ctx.qry.ofs = atoi(value); |
149 | } else if (!strcmp(name, "path")) { | 149 | } else if (!strcmp(name, "path")) { |
150 | ctx.qry.path = trim_end(value, '/'); | 150 | ctx.qry.path = trim_end(value, '/'); |
151 | } else if (!strcmp(name, "name")) { | 151 | } else if (!strcmp(name, "name")) { |
152 | ctx.qry.name = xstrdup(value); | 152 | ctx.qry.name = xstrdup(value); |
153 | } else if (!strcmp(name, "mimetype")) { | 153 | } else if (!strcmp(name, "mimetype")) { |
154 | ctx.qry.mimetype = xstrdup(value); | 154 | ctx.qry.mimetype = xstrdup(value); |
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | static void prepare_context(struct cgit_context *ctx) | 158 | static void prepare_context(struct cgit_context *ctx) |
159 | { | 159 | { |
160 | memset(ctx, 0, sizeof(ctx)); | 160 | memset(ctx, 0, sizeof(ctx)); |
161 | ctx->cfg.agefile = "info/web/last-modified"; | 161 | ctx->cfg.agefile = "info/web/last-modified"; |
162 | ctx->cfg.nocache = 0; | 162 | ctx->cfg.nocache = 0; |
163 | ctx->cfg.cache_size = 0; | 163 | ctx->cfg.cache_size = 0; |
164 | ctx->cfg.cache_dynamic_ttl = 5; | 164 | ctx->cfg.cache_dynamic_ttl = 5; |
165 | ctx->cfg.cache_max_create_time = 5; | 165 | ctx->cfg.cache_max_create_time = 5; |
166 | ctx->cfg.cache_repo_ttl = 5; | 166 | ctx->cfg.cache_repo_ttl = 5; |
167 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 167 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
168 | ctx->cfg.cache_root_ttl = 5; | 168 | ctx->cfg.cache_root_ttl = 5; |
169 | ctx->cfg.cache_static_ttl = -1; | 169 | ctx->cfg.cache_static_ttl = -1; |
170 | ctx->cfg.css = "/cgit.css"; | 170 | ctx->cfg.css = "/cgit.css"; |
171 | ctx->cfg.logo = "/git-logo.png"; | 171 | ctx->cfg.logo = "/git-logo.png"; |
172 | ctx->cfg.local_time = 0; | 172 | ctx->cfg.local_time = 0; |
173 | ctx->cfg.max_repo_count = 50; | 173 | ctx->cfg.max_repo_count = 50; |
174 | ctx->cfg.max_commit_count = 50; | 174 | ctx->cfg.max_commit_count = 50; |
175 | ctx->cfg.max_lock_attempts = 5; | 175 | ctx->cfg.max_lock_attempts = 5; |
176 | ctx->cfg.max_msg_len = 80; | 176 | ctx->cfg.max_msg_len = 80; |
177 | ctx->cfg.max_repodesc_len = 80; | 177 | ctx->cfg.max_repodesc_len = 80; |
178 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 178 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
179 | ctx->cfg.renamelimit = -1; | 179 | ctx->cfg.renamelimit = -1; |
180 | ctx->cfg.robots = "index, nofollow"; | 180 | ctx->cfg.robots = "index, nofollow"; |
181 | ctx->cfg.root_title = "Git repository browser"; | 181 | ctx->cfg.root_title = "Git repository browser"; |
182 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 182 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
183 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 183 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
184 | ctx->cfg.summary_branches = 10; | 184 | ctx->cfg.summary_branches = 10; |
185 | ctx->cfg.summary_log = 10; | 185 | ctx->cfg.summary_log = 10; |
186 | ctx->cfg.summary_tags = 10; | 186 | ctx->cfg.summary_tags = 10; |
187 | ctx->page.mimetype = "text/html"; | 187 | ctx->page.mimetype = "text/html"; |
188 | ctx->page.charset = PAGE_ENCODING; | 188 | ctx->page.charset = PAGE_ENCODING; |
189 | ctx->page.filename = NULL; | 189 | ctx->page.filename = NULL; |
190 | ctx->page.size = 0; | ||
190 | ctx->page.modified = time(NULL); | 191 | ctx->page.modified = time(NULL); |
191 | ctx->page.expires = ctx->page.modified; | 192 | ctx->page.expires = ctx->page.modified; |
192 | } | 193 | } |
193 | 194 | ||
194 | struct refmatch { | 195 | struct refmatch { |
195 | char *req_ref; | 196 | char *req_ref; |
196 | char *first_ref; | 197 | char *first_ref; |
197 | int match; | 198 | int match; |
198 | }; | 199 | }; |
199 | 200 | ||
200 | int find_current_ref(const char *refname, const unsigned char *sha1, | 201 | int find_current_ref(const char *refname, const unsigned char *sha1, |
201 | int flags, void *cb_data) | 202 | int flags, void *cb_data) |
202 | { | 203 | { |
203 | struct refmatch *info; | 204 | struct refmatch *info; |
204 | 205 | ||
205 | info = (struct refmatch *)cb_data; | 206 | info = (struct refmatch *)cb_data; |
206 | if (!strcmp(refname, info->req_ref)) | 207 | if (!strcmp(refname, info->req_ref)) |
207 | info->match = 1; | 208 | info->match = 1; |
208 | if (!info->first_ref) | 209 | if (!info->first_ref) |
209 | info->first_ref = xstrdup(refname); | 210 | info->first_ref = xstrdup(refname); |
210 | return info->match; | 211 | return info->match; |
211 | } | 212 | } |
212 | 213 | ||
213 | char *find_default_branch(struct cgit_repo *repo) | 214 | char *find_default_branch(struct cgit_repo *repo) |
214 | { | 215 | { |
215 | struct refmatch info; | 216 | struct refmatch info; |
216 | char *ref; | 217 | char *ref; |
217 | 218 | ||
218 | info.req_ref = repo->defbranch; | 219 | info.req_ref = repo->defbranch; |
219 | info.first_ref = NULL; | 220 | info.first_ref = NULL; |
220 | info.match = 0; | 221 | info.match = 0; |
221 | for_each_branch_ref(find_current_ref, &info); | 222 | for_each_branch_ref(find_current_ref, &info); |
222 | if (info.match) | 223 | if (info.match) |
223 | ref = info.req_ref; | 224 | ref = info.req_ref; |
224 | else | 225 | else |
225 | ref = info.first_ref; | 226 | ref = info.first_ref; |
226 | if (ref) | 227 | if (ref) |
227 | ref = xstrdup(ref); | 228 | ref = xstrdup(ref); |
228 | return ref; | 229 | return ref; |
229 | } | 230 | } |
230 | 231 | ||
231 | static int prepare_repo_cmd(struct cgit_context *ctx) | 232 | static int prepare_repo_cmd(struct cgit_context *ctx) |
232 | { | 233 | { |
233 | char *tmp; | 234 | char *tmp; |
234 | unsigned char sha1[20]; | 235 | unsigned char sha1[20]; |
235 | int nongit = 0; | 236 | int nongit = 0; |
236 | 237 | ||
237 | setenv("GIT_DIR", ctx->repo->path, 1); | 238 | setenv("GIT_DIR", ctx->repo->path, 1); |
238 | setup_git_directory_gently(&nongit); | 239 | setup_git_directory_gently(&nongit); |
239 | if (nongit) { | 240 | if (nongit) { |
240 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 241 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
241 | "config error"); | 242 | "config error"); |
242 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 243 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
243 | ctx->repo = NULL; | 244 | ctx->repo = NULL; |
244 | cgit_print_http_headers(ctx); | 245 | cgit_print_http_headers(ctx); |
245 | cgit_print_docstart(ctx); | 246 | cgit_print_docstart(ctx); |
246 | cgit_print_pageheader(ctx); | 247 | cgit_print_pageheader(ctx); |
247 | cgit_print_error(tmp); | 248 | cgit_print_error(tmp); |
248 | cgit_print_docend(); | 249 | cgit_print_docend(); |
249 | return 1; | 250 | return 1; |
250 | } | 251 | } |
251 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 252 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
252 | 253 | ||
253 | if (!ctx->qry.head) { | 254 | if (!ctx->qry.head) { |
254 | ctx->qry.head = find_default_branch(ctx->repo); | 255 | ctx->qry.head = find_default_branch(ctx->repo); |
255 | ctx->repo->defbranch = ctx->qry.head; | 256 | ctx->repo->defbranch = ctx->qry.head; |
256 | } | 257 | } |
257 | 258 | ||
258 | if (!ctx->qry.head) { | 259 | if (!ctx->qry.head) { |
259 | cgit_print_http_headers(ctx); | 260 | cgit_print_http_headers(ctx); |
260 | cgit_print_docstart(ctx); | 261 | cgit_print_docstart(ctx); |
261 | cgit_print_pageheader(ctx); | 262 | cgit_print_pageheader(ctx); |
262 | cgit_print_error("Repository seems to be empty"); | 263 | cgit_print_error("Repository seems to be empty"); |
263 | cgit_print_docend(); | 264 | cgit_print_docend(); |
264 | return 1; | 265 | return 1; |
265 | } | 266 | } |
266 | 267 | ||
267 | if (get_sha1(ctx->qry.head, sha1)) { | 268 | if (get_sha1(ctx->qry.head, sha1)) { |
268 | tmp = xstrdup(ctx->qry.head); | 269 | tmp = xstrdup(ctx->qry.head); |
269 | ctx->qry.head = ctx->repo->defbranch; | 270 | ctx->qry.head = ctx->repo->defbranch; |
270 | cgit_print_http_headers(ctx); | 271 | cgit_print_http_headers(ctx); |
271 | cgit_print_docstart(ctx); | 272 | cgit_print_docstart(ctx); |
272 | cgit_print_pageheader(ctx); | 273 | cgit_print_pageheader(ctx); |
273 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 274 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
274 | cgit_print_docend(); | 275 | cgit_print_docend(); |
275 | return 1; | 276 | return 1; |
276 | } | 277 | } |
277 | return 0; | 278 | return 0; |
278 | } | 279 | } |
279 | 280 | ||
280 | static void process_request(void *cbdata) | 281 | static void process_request(void *cbdata) |
281 | { | 282 | { |
282 | struct cgit_context *ctx = cbdata; | 283 | struct cgit_context *ctx = cbdata; |
283 | struct cgit_cmd *cmd; | 284 | struct cgit_cmd *cmd; |
284 | 285 | ||
285 | cmd = cgit_get_cmd(ctx); | 286 | cmd = cgit_get_cmd(ctx); |
286 | if (!cmd) { | 287 | if (!cmd) { |
287 | ctx->page.title = "cgit error"; | 288 | ctx->page.title = "cgit error"; |
288 | ctx->repo = NULL; | 289 | ctx->repo = NULL; |
289 | cgit_print_http_headers(ctx); | 290 | cgit_print_http_headers(ctx); |
290 | cgit_print_docstart(ctx); | 291 | cgit_print_docstart(ctx); |
291 | cgit_print_pageheader(ctx); | 292 | cgit_print_pageheader(ctx); |
292 | cgit_print_error("Invalid request"); | 293 | cgit_print_error("Invalid request"); |
293 | cgit_print_docend(); | 294 | cgit_print_docend(); |
294 | return; | 295 | return; |
295 | } | 296 | } |
296 | 297 | ||
297 | if (cmd->want_repo && !ctx->repo) { | 298 | if (cmd->want_repo && !ctx->repo) { |
298 | cgit_print_http_headers(ctx); | 299 | cgit_print_http_headers(ctx); |
299 | cgit_print_docstart(ctx); | 300 | cgit_print_docstart(ctx); |
300 | cgit_print_pageheader(ctx); | 301 | cgit_print_pageheader(ctx); |
301 | cgit_print_error(fmt("No repository selected")); | 302 | cgit_print_error(fmt("No repository selected")); |
302 | cgit_print_docend(); | 303 | cgit_print_docend(); |
303 | return; | 304 | return; |
304 | } | 305 | } |
305 | 306 | ||
306 | if (ctx->repo && prepare_repo_cmd(ctx)) | 307 | if (ctx->repo && prepare_repo_cmd(ctx)) |
307 | return; | 308 | return; |
308 | 309 | ||
309 | if (cmd->want_layout) { | 310 | if (cmd->want_layout) { |
310 | cgit_print_http_headers(ctx); | 311 | cgit_print_http_headers(ctx); |
311 | cgit_print_docstart(ctx); | 312 | cgit_print_docstart(ctx); |
312 | cgit_print_pageheader(ctx); | 313 | cgit_print_pageheader(ctx); |
313 | } | 314 | } |
314 | 315 | ||
315 | cmd->fn(ctx); | 316 | cmd->fn(ctx); |
316 | 317 | ||
317 | if (cmd->want_layout) | 318 | if (cmd->want_layout) |
318 | cgit_print_docend(); | 319 | cgit_print_docend(); |
319 | } | 320 | } |
320 | 321 | ||
321 | static void cgit_parse_args(int argc, const char **argv) | 322 | static void cgit_parse_args(int argc, const char **argv) |
322 | { | 323 | { |
323 | int i; | 324 | int i; |
324 | 325 | ||
325 | for (i = 1; i < argc; i++) { | 326 | for (i = 1; i < argc; i++) { |
326 | if (!strncmp(argv[i], "--cache=", 8)) { | 327 | if (!strncmp(argv[i], "--cache=", 8)) { |
327 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 328 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
328 | } | 329 | } |
329 | if (!strcmp(argv[i], "--nocache")) { | 330 | if (!strcmp(argv[i], "--nocache")) { |
330 | ctx.cfg.nocache = 1; | 331 | ctx.cfg.nocache = 1; |
331 | } | 332 | } |
332 | if (!strncmp(argv[i], "--query=", 8)) { | 333 | if (!strncmp(argv[i], "--query=", 8)) { |
333 | ctx.qry.raw = xstrdup(argv[i]+8); | 334 | ctx.qry.raw = xstrdup(argv[i]+8); |
334 | } | 335 | } |
335 | if (!strncmp(argv[i], "--repo=", 7)) { | 336 | if (!strncmp(argv[i], "--repo=", 7)) { |
336 | ctx.qry.repo = xstrdup(argv[i]+7); | 337 | ctx.qry.repo = xstrdup(argv[i]+7); |
337 | } | 338 | } |
338 | if (!strncmp(argv[i], "--page=", 7)) { | 339 | if (!strncmp(argv[i], "--page=", 7)) { |
339 | ctx.qry.page = xstrdup(argv[i]+7); | 340 | ctx.qry.page = xstrdup(argv[i]+7); |
340 | } | 341 | } |
341 | if (!strncmp(argv[i], "--head=", 7)) { | 342 | if (!strncmp(argv[i], "--head=", 7)) { |
342 | ctx.qry.head = xstrdup(argv[i]+7); | 343 | ctx.qry.head = xstrdup(argv[i]+7); |
343 | ctx.qry.has_symref = 1; | 344 | ctx.qry.has_symref = 1; |
344 | } | 345 | } |
345 | if (!strncmp(argv[i], "--sha1=", 7)) { | 346 | if (!strncmp(argv[i], "--sha1=", 7)) { |
346 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 347 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
347 | ctx.qry.has_sha1 = 1; | 348 | ctx.qry.has_sha1 = 1; |
348 | } | 349 | } |
349 | if (!strncmp(argv[i], "--ofs=", 6)) { | 350 | if (!strncmp(argv[i], "--ofs=", 6)) { |
350 | ctx.qry.ofs = atoi(argv[i]+6); | 351 | ctx.qry.ofs = atoi(argv[i]+6); |
351 | } | 352 | } |
352 | } | 353 | } |
353 | } | 354 | } |
354 | 355 | ||
355 | static int calc_ttl() | 356 | static int calc_ttl() |
356 | { | 357 | { |
357 | if (!ctx.repo) | 358 | if (!ctx.repo) |
358 | return ctx.cfg.cache_root_ttl; | 359 | return ctx.cfg.cache_root_ttl; |
359 | 360 | ||
360 | if (!ctx.qry.page) | 361 | if (!ctx.qry.page) |
361 | return ctx.cfg.cache_repo_ttl; | 362 | return ctx.cfg.cache_repo_ttl; |
362 | 363 | ||
363 | if (ctx.qry.has_symref) | 364 | if (ctx.qry.has_symref) |
364 | return ctx.cfg.cache_dynamic_ttl; | 365 | return ctx.cfg.cache_dynamic_ttl; |
365 | 366 | ||
366 | if (ctx.qry.has_sha1) | 367 | if (ctx.qry.has_sha1) |
367 | return ctx.cfg.cache_static_ttl; | 368 | return ctx.cfg.cache_static_ttl; |
368 | 369 | ||
369 | return ctx.cfg.cache_repo_ttl; | 370 | return ctx.cfg.cache_repo_ttl; |
370 | } | 371 | } |
371 | 372 | ||
372 | int main(int argc, const char **argv) | 373 | int main(int argc, const char **argv) |
373 | { | 374 | { |
374 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 375 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
375 | int err, ttl; | 376 | int err, ttl; |
376 | 377 | ||
377 | prepare_context(&ctx); | 378 | prepare_context(&ctx); |
378 | cgit_repolist.length = 0; | 379 | cgit_repolist.length = 0; |
379 | cgit_repolist.count = 0; | 380 | cgit_repolist.count = 0; |
380 | cgit_repolist.repos = NULL; | 381 | cgit_repolist.repos = NULL; |
381 | 382 | ||
@@ -1,239 +1,240 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 19 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Dateformats used on misc. pages | 23 | * Dateformats used on misc. pages |
24 | */ | 24 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | 27 | ||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Limits used for relative dates | 30 | * Limits used for relative dates |
31 | */ | 31 | */ |
32 | #define TM_MIN 60 | 32 | #define TM_MIN 60 |
33 | #define TM_HOUR (TM_MIN * 60) | 33 | #define TM_HOUR (TM_MIN * 60) |
34 | #define TM_DAY (TM_HOUR * 24) | 34 | #define TM_DAY (TM_HOUR * 24) |
35 | #define TM_WEEK (TM_DAY * 7) | 35 | #define TM_WEEK (TM_DAY * 7) |
36 | #define TM_YEAR (TM_DAY * 365) | 36 | #define TM_YEAR (TM_DAY * 365) |
37 | #define TM_MONTH (TM_YEAR / 12.0) | 37 | #define TM_MONTH (TM_YEAR / 12.0) |
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Default encoding | 41 | * Default encoding |
42 | */ | 42 | */ |
43 | #define PAGE_ENCODING "UTF-8" | 43 | #define PAGE_ENCODING "UTF-8" |
44 | 44 | ||
45 | typedef void (*configfn)(const char *name, const char *value); | 45 | typedef void (*configfn)(const char *name, const char *value); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
47 | typedef void (*linediff_fn)(char *line, int len); | 47 | typedef void (*linediff_fn)(char *line, int len); |
48 | 48 | ||
49 | struct cgit_repo { | 49 | struct cgit_repo { |
50 | char *url; | 50 | char *url; |
51 | char *name; | 51 | char *name; |
52 | char *path; | 52 | char *path; |
53 | char *desc; | 53 | char *desc; |
54 | char *owner; | 54 | char *owner; |
55 | char *defbranch; | 55 | char *defbranch; |
56 | char *group; | 56 | char *group; |
57 | char *module_link; | 57 | char *module_link; |
58 | char *readme; | 58 | char *readme; |
59 | char *clone_url; | 59 | char *clone_url; |
60 | int snapshots; | 60 | int snapshots; |
61 | int enable_log_filecount; | 61 | int enable_log_filecount; |
62 | int enable_log_linecount; | 62 | int enable_log_linecount; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | struct cgit_repolist { | 65 | struct cgit_repolist { |
66 | int length; | 66 | int length; |
67 | int count; | 67 | int count; |
68 | struct cgit_repo *repos; | 68 | struct cgit_repo *repos; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct commitinfo { | 71 | struct commitinfo { |
72 | struct commit *commit; | 72 | struct commit *commit; |
73 | char *author; | 73 | char *author; |
74 | char *author_email; | 74 | char *author_email; |
75 | unsigned long author_date; | 75 | unsigned long author_date; |
76 | char *committer; | 76 | char *committer; |
77 | char *committer_email; | 77 | char *committer_email; |
78 | unsigned long committer_date; | 78 | unsigned long committer_date; |
79 | char *subject; | 79 | char *subject; |
80 | char *msg; | 80 | char *msg; |
81 | char *msg_encoding; | 81 | char *msg_encoding; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct taginfo { | 84 | struct taginfo { |
85 | char *tagger; | 85 | char *tagger; |
86 | char *tagger_email; | 86 | char *tagger_email; |
87 | int tagger_date; | 87 | int tagger_date; |
88 | char *msg; | 88 | char *msg; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct refinfo { | 91 | struct refinfo { |
92 | const char *refname; | 92 | const char *refname; |
93 | struct object *object; | 93 | struct object *object; |
94 | union { | 94 | union { |
95 | struct taginfo *tag; | 95 | struct taginfo *tag; |
96 | struct commitinfo *commit; | 96 | struct commitinfo *commit; |
97 | }; | 97 | }; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct reflist { | 100 | struct reflist { |
101 | struct refinfo **refs; | 101 | struct refinfo **refs; |
102 | int alloc; | 102 | int alloc; |
103 | int count; | 103 | int count; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct cgit_query { | 106 | struct cgit_query { |
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | char *mimetype; | 119 | char *mimetype; |
120 | int ofs; | 120 | int ofs; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct cgit_config { | 123 | struct cgit_config { |
124 | char *agefile; | 124 | char *agefile; |
125 | char *cache_root; | 125 | char *cache_root; |
126 | char *clone_prefix; | 126 | char *clone_prefix; |
127 | char *css; | 127 | char *css; |
128 | char *favicon; | 128 | char *favicon; |
129 | char *footer; | 129 | char *footer; |
130 | char *index_header; | 130 | char *index_header; |
131 | char *index_info; | 131 | char *index_info; |
132 | char *logo; | 132 | char *logo; |
133 | char *logo_link; | 133 | char *logo_link; |
134 | char *module_link; | 134 | char *module_link; |
135 | char *repo_group; | 135 | char *repo_group; |
136 | char *robots; | 136 | char *robots; |
137 | char *root_title; | 137 | char *root_title; |
138 | char *root_desc; | 138 | char *root_desc; |
139 | char *root_readme; | 139 | char *root_readme; |
140 | char *script_name; | 140 | char *script_name; |
141 | char *virtual_root; | 141 | char *virtual_root; |
142 | int cache_size; | 142 | int cache_size; |
143 | int cache_dynamic_ttl; | 143 | int cache_dynamic_ttl; |
144 | int cache_max_create_time; | 144 | int cache_max_create_time; |
145 | int cache_repo_ttl; | 145 | int cache_repo_ttl; |
146 | int cache_root_ttl; | 146 | int cache_root_ttl; |
147 | int cache_static_ttl; | 147 | int cache_static_ttl; |
148 | int enable_index_links; | 148 | int enable_index_links; |
149 | int enable_log_filecount; | 149 | int enable_log_filecount; |
150 | int enable_log_linecount; | 150 | int enable_log_linecount; |
151 | int local_time; | 151 | int local_time; |
152 | int max_repo_count; | 152 | int max_repo_count; |
153 | int max_commit_count; | 153 | int max_commit_count; |
154 | int max_lock_attempts; | 154 | int max_lock_attempts; |
155 | int max_msg_len; | 155 | int max_msg_len; |
156 | int max_repodesc_len; | 156 | int max_repodesc_len; |
157 | int nocache; | 157 | int nocache; |
158 | int renamelimit; | 158 | int renamelimit; |
159 | int snapshots; | 159 | int snapshots; |
160 | int summary_branches; | 160 | int summary_branches; |
161 | int summary_log; | 161 | int summary_log; |
162 | int summary_tags; | 162 | int summary_tags; |
163 | }; | 163 | }; |
164 | 164 | ||
165 | struct cgit_page { | 165 | struct cgit_page { |
166 | time_t modified; | 166 | time_t modified; |
167 | time_t expires; | 167 | time_t expires; |
168 | size_t size; | ||
168 | char *mimetype; | 169 | char *mimetype; |
169 | char *charset; | 170 | char *charset; |
170 | char *filename; | 171 | char *filename; |
171 | char *title; | 172 | char *title; |
172 | }; | 173 | }; |
173 | 174 | ||
174 | struct cgit_context { | 175 | struct cgit_context { |
175 | struct cgit_query qry; | 176 | struct cgit_query qry; |
176 | struct cgit_config cfg; | 177 | struct cgit_config cfg; |
177 | struct cgit_repo *repo; | 178 | struct cgit_repo *repo; |
178 | struct cgit_page page; | 179 | struct cgit_page page; |
179 | }; | 180 | }; |
180 | 181 | ||
181 | struct cgit_snapshot_format { | 182 | struct cgit_snapshot_format { |
182 | const char *suffix; | 183 | const char *suffix; |
183 | const char *mimetype; | 184 | const char *mimetype; |
184 | write_archive_fn_t write_func; | 185 | write_archive_fn_t write_func; |
185 | int bit; | 186 | int bit; |
186 | }; | 187 | }; |
187 | 188 | ||
188 | extern const char *cgit_version; | 189 | extern const char *cgit_version; |
189 | 190 | ||
190 | extern struct cgit_repolist cgit_repolist; | 191 | extern struct cgit_repolist cgit_repolist; |
191 | extern struct cgit_context ctx; | 192 | extern struct cgit_context ctx; |
192 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 193 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
193 | 194 | ||
194 | extern struct cgit_repo *cgit_add_repo(const char *url); | 195 | extern struct cgit_repo *cgit_add_repo(const char *url); |
195 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 196 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
196 | extern void cgit_repo_config_cb(const char *name, const char *value); | 197 | extern void cgit_repo_config_cb(const char *name, const char *value); |
197 | 198 | ||
198 | extern int chk_zero(int result, char *msg); | 199 | extern int chk_zero(int result, char *msg); |
199 | extern int chk_positive(int result, char *msg); | 200 | extern int chk_positive(int result, char *msg); |
200 | extern int chk_non_negative(int result, char *msg); | 201 | extern int chk_non_negative(int result, char *msg); |
201 | 202 | ||
202 | extern char *trim_end(const char *str, char c); | 203 | extern char *trim_end(const char *str, char c); |
203 | extern char *strlpart(char *txt, int maxlen); | 204 | extern char *strlpart(char *txt, int maxlen); |
204 | extern char *strrpart(char *txt, int maxlen); | 205 | extern char *strrpart(char *txt, int maxlen); |
205 | 206 | ||
206 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 207 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
207 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 208 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
208 | int flags, void *cb_data); | 209 | int flags, void *cb_data); |
209 | 210 | ||
210 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 211 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
211 | 212 | ||
212 | extern int cgit_diff_files(const unsigned char *old_sha1, | 213 | extern int cgit_diff_files(const unsigned char *old_sha1, |
213 | const unsigned char *new_sha1, | 214 | const unsigned char *new_sha1, |
214 | linediff_fn fn); | 215 | linediff_fn fn); |
215 | 216 | ||
216 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 217 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
217 | const unsigned char *new_sha1, | 218 | const unsigned char *new_sha1, |
218 | filepair_fn fn, const char *prefix); | 219 | filepair_fn fn, const char *prefix); |
219 | 220 | ||
220 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 221 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
221 | 222 | ||
222 | extern char *fmt(const char *format,...); | 223 | extern char *fmt(const char *format,...); |
223 | 224 | ||
224 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 225 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
225 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 226 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
226 | extern void cgit_parse_url(const char *url); | 227 | extern void cgit_parse_url(const char *url); |
227 | 228 | ||
228 | extern const char *cgit_repobasename(const char *reponame); | 229 | extern const char *cgit_repobasename(const char *reponame); |
229 | 230 | ||
230 | extern int cgit_parse_snapshots_mask(const char *str); | 231 | extern int cgit_parse_snapshots_mask(const char *str); |
231 | 232 | ||
232 | /* libgit.a either links against or compiles its own implementation of | 233 | /* libgit.a either links against or compiles its own implementation of |
233 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it | 234 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it |
234 | * seems to do the trick. | 235 | * seems to do the trick. |
235 | */ | 236 | */ |
236 | extern char *strcasestr(const char *haystack, const char *needle); | 237 | extern char *strcasestr(const char *haystack, const char *needle); |
237 | 238 | ||
238 | 239 | ||
239 | #endif /* CGIT_H */ | 240 | #endif /* CGIT_H */ |
@@ -1,151 +1,158 @@ | |||
1 | /* cmd.c: the cgit command dispatcher | 1 | /* cmd.c: the cgit command dispatcher |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 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 | #include "cmd.h" | 10 | #include "cmd.h" |
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-blob.h" | 13 | #include "ui-blob.h" |
14 | #include "ui-clone.h" | 14 | #include "ui-clone.h" |
15 | #include "ui-commit.h" | 15 | #include "ui-commit.h" |
16 | #include "ui-diff.h" | 16 | #include "ui-diff.h" |
17 | #include "ui-log.h" | 17 | #include "ui-log.h" |
18 | #include "ui-patch.h" | 18 | #include "ui-patch.h" |
19 | #include "ui-plain.h" | ||
19 | #include "ui-refs.h" | 20 | #include "ui-refs.h" |
20 | #include "ui-repolist.h" | 21 | #include "ui-repolist.h" |
21 | #include "ui-snapshot.h" | 22 | #include "ui-snapshot.h" |
22 | #include "ui-summary.h" | 23 | #include "ui-summary.h" |
23 | #include "ui-tag.h" | 24 | #include "ui-tag.h" |
24 | #include "ui-tree.h" | 25 | #include "ui-tree.h" |
25 | 26 | ||
26 | static void HEAD_fn(struct cgit_context *ctx) | 27 | static void HEAD_fn(struct cgit_context *ctx) |
27 | { | 28 | { |
28 | cgit_clone_head(ctx); | 29 | cgit_clone_head(ctx); |
29 | } | 30 | } |
30 | 31 | ||
31 | static void about_fn(struct cgit_context *ctx) | 32 | static void about_fn(struct cgit_context *ctx) |
32 | { | 33 | { |
33 | if (ctx->repo) | 34 | if (ctx->repo) |
34 | cgit_print_repo_readme(); | 35 | cgit_print_repo_readme(); |
35 | else | 36 | else |
36 | cgit_print_site_readme(); | 37 | cgit_print_site_readme(); |
37 | } | 38 | } |
38 | 39 | ||
39 | static void blob_fn(struct cgit_context *ctx) | 40 | static void blob_fn(struct cgit_context *ctx) |
40 | { | 41 | { |
41 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); | 42 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
42 | } | 43 | } |
43 | 44 | ||
44 | static void commit_fn(struct cgit_context *ctx) | 45 | static void commit_fn(struct cgit_context *ctx) |
45 | { | 46 | { |
46 | cgit_print_commit(ctx->qry.sha1); | 47 | cgit_print_commit(ctx->qry.sha1); |
47 | } | 48 | } |
48 | 49 | ||
49 | static void diff_fn(struct cgit_context *ctx) | 50 | static void diff_fn(struct cgit_context *ctx) |
50 | { | 51 | { |
51 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 52 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
52 | } | 53 | } |
53 | 54 | ||
54 | static void info_fn(struct cgit_context *ctx) | 55 | static void info_fn(struct cgit_context *ctx) |
55 | { | 56 | { |
56 | cgit_clone_info(ctx); | 57 | cgit_clone_info(ctx); |
57 | } | 58 | } |
58 | 59 | ||
59 | static void log_fn(struct cgit_context *ctx) | 60 | static void log_fn(struct cgit_context *ctx) |
60 | { | 61 | { |
61 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 62 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
62 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 63 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
63 | } | 64 | } |
64 | 65 | ||
65 | static void ls_cache_fn(struct cgit_context *ctx) | 66 | static void ls_cache_fn(struct cgit_context *ctx) |
66 | { | 67 | { |
67 | ctx->page.mimetype = "text/plain"; | 68 | ctx->page.mimetype = "text/plain"; |
68 | ctx->page.filename = "ls-cache.txt"; | 69 | ctx->page.filename = "ls-cache.txt"; |
69 | cgit_print_http_headers(ctx); | 70 | cgit_print_http_headers(ctx); |
70 | cache_ls(ctx->cfg.cache_root); | 71 | cache_ls(ctx->cfg.cache_root); |
71 | } | 72 | } |
72 | 73 | ||
73 | static void objects_fn(struct cgit_context *ctx) | 74 | static void objects_fn(struct cgit_context *ctx) |
74 | { | 75 | { |
75 | cgit_clone_objects(ctx); | 76 | cgit_clone_objects(ctx); |
76 | } | 77 | } |
77 | 78 | ||
78 | static void repolist_fn(struct cgit_context *ctx) | 79 | static void repolist_fn(struct cgit_context *ctx) |
79 | { | 80 | { |
80 | cgit_print_repolist(); | 81 | cgit_print_repolist(); |
81 | } | 82 | } |
82 | 83 | ||
83 | static void patch_fn(struct cgit_context *ctx) | 84 | static void patch_fn(struct cgit_context *ctx) |
84 | { | 85 | { |
85 | cgit_print_patch(ctx->qry.sha1); | 86 | cgit_print_patch(ctx->qry.sha1); |
86 | } | 87 | } |
87 | 88 | ||
89 | static void plain_fn(struct cgit_context *ctx) | ||
90 | { | ||
91 | cgit_print_plain(ctx); | ||
92 | } | ||
93 | |||
88 | static void refs_fn(struct cgit_context *ctx) | 94 | static void refs_fn(struct cgit_context *ctx) |
89 | { | 95 | { |
90 | cgit_print_refs(); | 96 | cgit_print_refs(); |
91 | } | 97 | } |
92 | 98 | ||
93 | static void snapshot_fn(struct cgit_context *ctx) | 99 | static void snapshot_fn(struct cgit_context *ctx) |
94 | { | 100 | { |
95 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, | 101 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, |
96 | cgit_repobasename(ctx->repo->url), ctx->qry.path, | 102 | cgit_repobasename(ctx->repo->url), ctx->qry.path, |
97 | ctx->repo->snapshots); | 103 | ctx->repo->snapshots); |
98 | } | 104 | } |
99 | 105 | ||
100 | static void summary_fn(struct cgit_context *ctx) | 106 | static void summary_fn(struct cgit_context *ctx) |
101 | { | 107 | { |
102 | cgit_print_summary(); | 108 | cgit_print_summary(); |
103 | } | 109 | } |
104 | 110 | ||
105 | static void tag_fn(struct cgit_context *ctx) | 111 | static void tag_fn(struct cgit_context *ctx) |
106 | { | 112 | { |
107 | cgit_print_tag(ctx->qry.sha1); | 113 | cgit_print_tag(ctx->qry.sha1); |
108 | } | 114 | } |
109 | 115 | ||
110 | static void tree_fn(struct cgit_context *ctx) | 116 | static void tree_fn(struct cgit_context *ctx) |
111 | { | 117 | { |
112 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); | 118 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
113 | } | 119 | } |
114 | 120 | ||
115 | #define def_cmd(name, want_repo, want_layout) \ | 121 | #define def_cmd(name, want_repo, want_layout) \ |
116 | {#name, name##_fn, want_repo, want_layout} | 122 | {#name, name##_fn, want_repo, want_layout} |
117 | 123 | ||
118 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 124 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
119 | { | 125 | { |
120 | static struct cgit_cmd cmds[] = { | 126 | static struct cgit_cmd cmds[] = { |
121 | def_cmd(HEAD, 1, 0), | 127 | def_cmd(HEAD, 1, 0), |
122 | def_cmd(about, 0, 1), | 128 | def_cmd(about, 0, 1), |
123 | def_cmd(blob, 1, 0), | 129 | def_cmd(blob, 1, 0), |
124 | def_cmd(commit, 1, 1), | 130 | def_cmd(commit, 1, 1), |
125 | def_cmd(diff, 1, 1), | 131 | def_cmd(diff, 1, 1), |
126 | def_cmd(info, 1, 0), | 132 | def_cmd(info, 1, 0), |
127 | def_cmd(log, 1, 1), | 133 | def_cmd(log, 1, 1), |
128 | def_cmd(ls_cache, 0, 0), | 134 | def_cmd(ls_cache, 0, 0), |
129 | def_cmd(objects, 1, 0), | 135 | def_cmd(objects, 1, 0), |
130 | def_cmd(patch, 1, 0), | 136 | def_cmd(patch, 1, 0), |
137 | def_cmd(plain, 1, 0), | ||
131 | def_cmd(refs, 1, 1), | 138 | def_cmd(refs, 1, 1), |
132 | def_cmd(repolist, 0, 0), | 139 | def_cmd(repolist, 0, 0), |
133 | def_cmd(snapshot, 1, 0), | 140 | def_cmd(snapshot, 1, 0), |
134 | def_cmd(summary, 1, 1), | 141 | def_cmd(summary, 1, 1), |
135 | def_cmd(tag, 1, 1), | 142 | def_cmd(tag, 1, 1), |
136 | def_cmd(tree, 1, 1), | 143 | def_cmd(tree, 1, 1), |
137 | }; | 144 | }; |
138 | int i; | 145 | int i; |
139 | 146 | ||
140 | if (ctx->qry.page == NULL) { | 147 | if (ctx->qry.page == NULL) { |
141 | if (ctx->repo) | 148 | if (ctx->repo) |
142 | ctx->qry.page = "summary"; | 149 | ctx->qry.page = "summary"; |
143 | else | 150 | else |
144 | ctx->qry.page = "repolist"; | 151 | ctx->qry.page = "repolist"; |
145 | } | 152 | } |
146 | 153 | ||
147 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) | 154 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) |
148 | if (!strcmp(ctx->qry.page, cmds[i].name)) | 155 | if (!strcmp(ctx->qry.page, cmds[i].name)) |
149 | return &cmds[i]; | 156 | return &cmds[i]; |
150 | return NULL; | 157 | return NULL; |
151 | } | 158 | } |
@@ -1,229 +1,234 @@ | |||
1 | /* html.c: helper functions for html output | 1 | /* html.c: helper functions for html output |
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 <unistd.h> | 9 | #include <unistd.h> |
10 | #include <stdio.h> | 10 | #include <stdio.h> |
11 | #include <stdlib.h> | 11 | #include <stdlib.h> |
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | #include <errno.h> | 14 | #include <errno.h> |
15 | 15 | ||
16 | int htmlfd = STDOUT_FILENO; | 16 | int htmlfd = STDOUT_FILENO; |
17 | 17 | ||
18 | char *fmt(const char *format, ...) | 18 | char *fmt(const char *format, ...) |
19 | { | 19 | { |
20 | static char buf[8][1024]; | 20 | static char buf[8][1024]; |
21 | static int bufidx; | 21 | static int bufidx; |
22 | int len; | 22 | int len; |
23 | va_list args; | 23 | va_list args; |
24 | 24 | ||
25 | bufidx++; | 25 | bufidx++; |
26 | bufidx &= 7; | 26 | bufidx &= 7; |
27 | 27 | ||
28 | va_start(args, format); | 28 | va_start(args, format); |
29 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); | 29 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
30 | va_end(args); | 30 | va_end(args); |
31 | if (len>sizeof(buf[bufidx])) { | 31 | if (len>sizeof(buf[bufidx])) { |
32 | fprintf(stderr, "[html.c] string truncated: %s\n", format); | 32 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
33 | exit(1); | 33 | exit(1); |
34 | } | 34 | } |
35 | return buf[bufidx]; | 35 | return buf[bufidx]; |
36 | } | 36 | } |
37 | 37 | ||
38 | void html_raw(const char *data, size_t size) | ||
39 | { | ||
40 | write(htmlfd, data, size); | ||
41 | } | ||
42 | |||
38 | void html(const char *txt) | 43 | void html(const char *txt) |
39 | { | 44 | { |
40 | write(htmlfd, txt, strlen(txt)); | 45 | write(htmlfd, txt, strlen(txt)); |
41 | } | 46 | } |
42 | 47 | ||
43 | void htmlf(const char *format, ...) | 48 | void htmlf(const char *format, ...) |
44 | { | 49 | { |
45 | static char buf[65536]; | 50 | static char buf[65536]; |
46 | va_list args; | 51 | va_list args; |
47 | 52 | ||
48 | va_start(args, format); | 53 | va_start(args, format); |
49 | vsnprintf(buf, sizeof(buf), format, args); | 54 | vsnprintf(buf, sizeof(buf), format, args); |
50 | va_end(args); | 55 | va_end(args); |
51 | html(buf); | 56 | html(buf); |
52 | } | 57 | } |
53 | 58 | ||
54 | void html_status(int code, int more_headers) | 59 | void html_status(int code, int more_headers) |
55 | { | 60 | { |
56 | htmlf("Status: %d\n", code); | 61 | htmlf("Status: %d\n", code); |
57 | if (!more_headers) | 62 | if (!more_headers) |
58 | html("\n"); | 63 | html("\n"); |
59 | } | 64 | } |
60 | 65 | ||
61 | void html_txt(char *txt) | 66 | void html_txt(char *txt) |
62 | { | 67 | { |
63 | char *t = txt; | 68 | char *t = txt; |
64 | while(t && *t){ | 69 | while(t && *t){ |
65 | int c = *t; | 70 | int c = *t; |
66 | if (c=='<' || c=='>' || c=='&') { | 71 | if (c=='<' || c=='>' || c=='&') { |
67 | write(htmlfd, txt, t - txt); | 72 | write(htmlfd, txt, t - txt); |
68 | if (c=='>') | 73 | if (c=='>') |
69 | html(">"); | 74 | html(">"); |
70 | else if (c=='<') | 75 | else if (c=='<') |
71 | html("<"); | 76 | html("<"); |
72 | else if (c=='&') | 77 | else if (c=='&') |
73 | html("&"); | 78 | html("&"); |
74 | txt = t+1; | 79 | txt = t+1; |
75 | } | 80 | } |
76 | t++; | 81 | t++; |
77 | } | 82 | } |
78 | if (t!=txt) | 83 | if (t!=txt) |
79 | html(txt); | 84 | html(txt); |
80 | } | 85 | } |
81 | 86 | ||
82 | void html_ntxt(int len, char *txt) | 87 | void html_ntxt(int len, char *txt) |
83 | { | 88 | { |
84 | char *t = txt; | 89 | char *t = txt; |
85 | while(t && *t && len--){ | 90 | while(t && *t && len--){ |
86 | int c = *t; | 91 | int c = *t; |
87 | if (c=='<' || c=='>' || c=='&') { | 92 | if (c=='<' || c=='>' || c=='&') { |
88 | write(htmlfd, txt, t - txt); | 93 | write(htmlfd, txt, t - txt); |
89 | if (c=='>') | 94 | if (c=='>') |
90 | html(">"); | 95 | html(">"); |
91 | else if (c=='<') | 96 | else if (c=='<') |
92 | html("<"); | 97 | html("<"); |
93 | else if (c=='&') | 98 | else if (c=='&') |
94 | html("&"); | 99 | html("&"); |
95 | txt = t+1; | 100 | txt = t+1; |
96 | } | 101 | } |
97 | t++; | 102 | t++; |
98 | } | 103 | } |
99 | if (t!=txt) | 104 | if (t!=txt) |
100 | write(htmlfd, txt, t - txt); | 105 | write(htmlfd, txt, t - txt); |
101 | if (len<0) | 106 | if (len<0) |
102 | html("..."); | 107 | html("..."); |
103 | } | 108 | } |
104 | 109 | ||
105 | void html_attr(char *txt) | 110 | void html_attr(char *txt) |
106 | { | 111 | { |
107 | char *t = txt; | 112 | char *t = txt; |
108 | while(t && *t){ | 113 | while(t && *t){ |
109 | int c = *t; | 114 | int c = *t; |
110 | if (c=='<' || c=='>' || c=='\'') { | 115 | if (c=='<' || c=='>' || c=='\'') { |
111 | write(htmlfd, txt, t - txt); | 116 | write(htmlfd, txt, t - txt); |
112 | if (c=='>') | 117 | if (c=='>') |
113 | html(">"); | 118 | html(">"); |
114 | else if (c=='<') | 119 | else if (c=='<') |
115 | html("<"); | 120 | html("<"); |
116 | else if (c=='\'') | 121 | else if (c=='\'') |
117 | html(""e;"); | 122 | html(""e;"); |
118 | txt = t+1; | 123 | txt = t+1; |
119 | } | 124 | } |
120 | t++; | 125 | t++; |
121 | } | 126 | } |
122 | if (t!=txt) | 127 | if (t!=txt) |
123 | html(txt); | 128 | html(txt); |
124 | } | 129 | } |
125 | 130 | ||
126 | void html_hidden(char *name, char *value) | 131 | void html_hidden(char *name, char *value) |
127 | { | 132 | { |
128 | html("<input type='hidden' name='"); | 133 | html("<input type='hidden' name='"); |
129 | html_attr(name); | 134 | html_attr(name); |
130 | html("' value='"); | 135 | html("' value='"); |
131 | html_attr(value); | 136 | html_attr(value); |
132 | html("'/>"); | 137 | html("'/>"); |
133 | } | 138 | } |
134 | 139 | ||
135 | void html_option(char *value, char *text, char *selected_value) | 140 | void html_option(char *value, char *text, char *selected_value) |
136 | { | 141 | { |
137 | html("<option value='"); | 142 | html("<option value='"); |
138 | html_attr(value); | 143 | html_attr(value); |
139 | html("'"); | 144 | html("'"); |
140 | if (selected_value && !strcmp(selected_value, value)) | 145 | if (selected_value && !strcmp(selected_value, value)) |
141 | html(" selected='selected'"); | 146 | html(" selected='selected'"); |
142 | html(">"); | 147 | html(">"); |
143 | html_txt(text); | 148 | html_txt(text); |
144 | html("</option>\n"); | 149 | html("</option>\n"); |
145 | } | 150 | } |
146 | 151 | ||
147 | void html_link_open(char *url, char *title, char *class) | 152 | void html_link_open(char *url, char *title, char *class) |
148 | { | 153 | { |
149 | html("<a href='"); | 154 | html("<a href='"); |
150 | html_attr(url); | 155 | html_attr(url); |
151 | if (title) { | 156 | if (title) { |
152 | html("' title='"); | 157 | html("' title='"); |
153 | html_attr(title); | 158 | html_attr(title); |
154 | } | 159 | } |
155 | if (class) { | 160 | if (class) { |
156 | html("' class='"); | 161 | html("' class='"); |
157 | html_attr(class); | 162 | html_attr(class); |
158 | } | 163 | } |
159 | html("'>"); | 164 | html("'>"); |
160 | } | 165 | } |
161 | 166 | ||
162 | void html_link_close(void) | 167 | void html_link_close(void) |
163 | { | 168 | { |
164 | html("</a>"); | 169 | html("</a>"); |
165 | } | 170 | } |
166 | 171 | ||
167 | void html_fileperm(unsigned short mode) | 172 | void html_fileperm(unsigned short mode) |
168 | { | 173 | { |
169 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), | 174 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
170 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); | 175 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
171 | } | 176 | } |
172 | 177 | ||
173 | int html_include(const char *filename) | 178 | int html_include(const char *filename) |
174 | { | 179 | { |
175 | FILE *f; | 180 | FILE *f; |
176 | char buf[4096]; | 181 | char buf[4096]; |
177 | size_t len; | 182 | size_t len; |
178 | 183 | ||
179 | if (!(f = fopen(filename, "r"))) { | 184 | if (!(f = fopen(filename, "r"))) { |
180 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", | 185 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", |
181 | filename, strerror(errno), errno); | 186 | filename, strerror(errno), errno); |
182 | return -1; | 187 | return -1; |
183 | } | 188 | } |
184 | while((len = fread(buf, 1, 4096, f)) > 0) | 189 | while((len = fread(buf, 1, 4096, f)) > 0) |
185 | write(htmlfd, buf, len); | 190 | write(htmlfd, buf, len); |
186 | fclose(f); | 191 | fclose(f); |
187 | return 0; | 192 | return 0; |
188 | } | 193 | } |
189 | 194 | ||
190 | int hextoint(char c) | 195 | int hextoint(char c) |
191 | { | 196 | { |
192 | if (c >= 'a' && c <= 'f') | 197 | if (c >= 'a' && c <= 'f') |
193 | return 10 + c - 'a'; | 198 | return 10 + c - 'a'; |
194 | else if (c >= 'A' && c <= 'F') | 199 | else if (c >= 'A' && c <= 'F') |
195 | return 10 + c - 'A'; | 200 | return 10 + c - 'A'; |
196 | else if (c >= '0' && c <= '9') | 201 | else if (c >= '0' && c <= '9') |
197 | return c - '0'; | 202 | return c - '0'; |
198 | else | 203 | else |
199 | return -1; | 204 | return -1; |
200 | } | 205 | } |
201 | 206 | ||
202 | char *convert_query_hexchar(char *txt) | 207 | char *convert_query_hexchar(char *txt) |
203 | { | 208 | { |
204 | int d1, d2; | 209 | int d1, d2; |
205 | if (strlen(txt) < 3) { | 210 | if (strlen(txt) < 3) { |
206 | *txt = '\0'; | 211 | *txt = '\0'; |
207 | return txt-1; | 212 | return txt-1; |
208 | } | 213 | } |
209 | d1 = hextoint(*(txt+1)); | 214 | d1 = hextoint(*(txt+1)); |
210 | d2 = hextoint(*(txt+2)); | 215 | d2 = hextoint(*(txt+2)); |
211 | if (d1<0 || d2<0) { | 216 | if (d1<0 || d2<0) { |
212 | strcpy(txt, txt+3); | 217 | strcpy(txt, txt+3); |
213 | return txt-1; | 218 | return txt-1; |
214 | } else { | 219 | } else { |
215 | *txt = d1 * 16 + d2; | 220 | *txt = d1 * 16 + d2; |
216 | strcpy(txt+1, txt+3); | 221 | strcpy(txt+1, txt+3); |
217 | return txt; | 222 | return txt; |
218 | } | 223 | } |
219 | } | 224 | } |
220 | 225 | ||
221 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) | 226 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) |
222 | { | 227 | { |
223 | char *t, *value = NULL, c; | 228 | char *t, *value = NULL, c; |
224 | 229 | ||
225 | if (!txt) | 230 | if (!txt) |
226 | return 0; | 231 | return 0; |
227 | 232 | ||
228 | t = txt = strdup(txt); | 233 | t = txt = strdup(txt); |
229 | if (t == NULL) { | 234 | if (t == NULL) { |
@@ -1,21 +1,22 @@ | |||
1 | #ifndef HTML_H | 1 | #ifndef HTML_H |
2 | #define HTML_H | 2 | #define HTML_H |
3 | 3 | ||
4 | extern int htmlfd; | 4 | extern int htmlfd; |
5 | 5 | ||
6 | extern void html_raw(const char *txt, size_t size); | ||
6 | extern void html(const char *txt); | 7 | extern void html(const char *txt); |
7 | extern void htmlf(const char *format,...); | 8 | extern void htmlf(const char *format,...); |
8 | extern void html_status(int code, int more_headers); | 9 | extern void html_status(int code, int more_headers); |
9 | extern void html_txt(char *txt); | 10 | extern void html_txt(char *txt); |
10 | extern void html_ntxt(int len, char *txt); | 11 | extern void html_ntxt(int len, char *txt); |
11 | extern void html_attr(char *txt); | 12 | extern void html_attr(char *txt); |
12 | extern void html_hidden(char *name, char *value); | 13 | extern void html_hidden(char *name, char *value); |
13 | extern void html_option(char *value, char *text, char *selected_value); | 14 | extern void html_option(char *value, char *text, char *selected_value); |
14 | extern void html_link_open(char *url, char *title, char *class); | 15 | extern void html_link_open(char *url, char *title, char *class); |
15 | extern void html_link_close(void); | 16 | extern void html_link_close(void); |
16 | extern void html_fileperm(unsigned short mode); | 17 | extern void html_fileperm(unsigned short mode); |
17 | extern int html_include(const char *filename); | 18 | extern int html_include(const char *filename); |
18 | 19 | ||
19 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); | 20 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); |
20 | 21 | ||
21 | #endif /* HTML_H */ | 22 | #endif /* HTML_H */ |
diff --git a/ui-plain.c b/ui-plain.c new file mode 100644 index 0000000..28deae5 --- a/dev/null +++ b/ui-plain.c | |||
@@ -0,0 +1,82 @@ | |||
1 | /* ui-plain.c: functions for output of plain blobs by path | ||
2 | * | ||
3 | * Copyright (C) 2008 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
12 | |||
13 | char *curr_rev; | ||
14 | char *match_path; | ||
15 | int match; | ||
16 | |||
17 | static void print_object(const unsigned char *sha1, const char *path) | ||
18 | { | ||
19 | enum object_type type; | ||
20 | char *buf; | ||
21 | size_t size; | ||
22 | |||
23 | type = sha1_object_info(sha1, &size); | ||
24 | if (type == OBJ_BAD) { | ||
25 | html_status(404, 0); | ||
26 | return; | ||
27 | } | ||
28 | |||
29 | buf = read_sha1_file(sha1, &type, &size); | ||
30 | if (!buf) { | ||
31 | html_status(404, 0); | ||
32 | return; | ||
33 | } | ||
34 | ctx.page.mimetype = "text/plain"; | ||
35 | ctx.page.filename = fmt("%s", path); | ||
36 | ctx.page.size = size; | ||
37 | cgit_print_http_headers(&ctx); | ||
38 | html_raw(buf, size); | ||
39 | match = 1; | ||
40 | } | ||
41 | |||
42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | ||
43 | const char *pathname, unsigned mode, int stage, | ||
44 | void *cbdata) | ||
45 | { | ||
46 | fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname); | ||
47 | |||
48 | if (!pathname || strcmp(match_path, pathname)) | ||
49 | return READ_TREE_RECURSIVE; | ||
50 | |||
51 | if (S_ISREG(mode)) | ||
52 | print_object(sha1, pathname); | ||
53 | |||
54 | return 0; | ||
55 | } | ||
56 | |||
57 | void cgit_print_plain(struct cgit_context *ctx) | ||
58 | { | ||
59 | const char *rev = ctx->qry.sha1; | ||
60 | unsigned char sha1[20]; | ||
61 | struct commit *commit; | ||
62 | const char *paths[] = {ctx->qry.path, NULL}; | ||
63 | |||
64 | if (!rev) | ||
65 | rev = ctx->qry.head; | ||
66 | |||
67 | curr_rev = xstrdup(rev); | ||
68 | if (get_sha1(rev, sha1)) { | ||
69 | html_status(404, 0); | ||
70 | return; | ||
71 | } | ||
72 | commit = lookup_commit_reference(sha1); | ||
73 | if (!commit || parse_commit(commit)) { | ||
74 | html_status(404, 0); | ||
75 | return; | ||
76 | } | ||
77 | match_path = ctx->qry.path; | ||
78 | fprintf(stderr, "[cgit] match_path=%s", match_path); | ||
79 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | ||
80 | if (!match) | ||
81 | html_status(404, 0); | ||
82 | } | ||
diff --git a/ui-plain.h b/ui-plain.h new file mode 100644 index 0000000..4373118 --- a/dev/null +++ b/ui-plain.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef UI_PLAIN_H | ||
2 | #define UI_PLAIN_H | ||
3 | |||
4 | extern void cgit_print_plain(struct cgit_context *ctx); | ||
5 | |||
6 | #endif /* UI_PLAIN_H */ | ||
diff --git a/ui-shared.c b/ui-shared.c index 197ee37..4408969 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -229,384 +229,386 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
229 | delim = repolink(title, class, page, head, path); | 229 | delim = repolink(title, class, page, head, path); |
230 | if (rev && strcmp(rev, ctx.qry.head)) { | 230 | if (rev && strcmp(rev, ctx.qry.head)) { |
231 | html(delim); | 231 | html(delim); |
232 | html("id="); | 232 | html("id="); |
233 | html_attr(rev); | 233 | html_attr(rev); |
234 | } | 234 | } |
235 | html("'>"); | 235 | html("'>"); |
236 | html_txt(name); | 236 | html_txt(name); |
237 | html("</a>"); | 237 | html("</a>"); |
238 | } | 238 | } |
239 | 239 | ||
240 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 240 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
241 | char *rev, char *path) | 241 | char *rev, char *path) |
242 | { | 242 | { |
243 | reporevlink("tree", name, title, class, head, rev, path); | 243 | reporevlink("tree", name, title, class, head, rev, path); |
244 | } | 244 | } |
245 | 245 | ||
246 | void cgit_log_link(char *name, char *title, char *class, char *head, | 246 | void cgit_log_link(char *name, char *title, char *class, char *head, |
247 | char *rev, char *path, int ofs, char *grep, char *pattern) | 247 | char *rev, char *path, int ofs, char *grep, char *pattern) |
248 | { | 248 | { |
249 | char *delim; | 249 | char *delim; |
250 | 250 | ||
251 | delim = repolink(title, class, "log", head, path); | 251 | delim = repolink(title, class, "log", head, path); |
252 | if (rev && strcmp(rev, ctx.qry.head)) { | 252 | if (rev && strcmp(rev, ctx.qry.head)) { |
253 | html(delim); | 253 | html(delim); |
254 | html("id="); | 254 | html("id="); |
255 | html_attr(rev); | 255 | html_attr(rev); |
256 | delim = "&"; | 256 | delim = "&"; |
257 | } | 257 | } |
258 | if (grep && pattern) { | 258 | if (grep && pattern) { |
259 | html(delim); | 259 | html(delim); |
260 | html("qt="); | 260 | html("qt="); |
261 | html_attr(grep); | 261 | html_attr(grep); |
262 | delim = "&"; | 262 | delim = "&"; |
263 | html(delim); | 263 | html(delim); |
264 | html("q="); | 264 | html("q="); |
265 | html_attr(pattern); | 265 | html_attr(pattern); |
266 | } | 266 | } |
267 | if (ofs > 0) { | 267 | if (ofs > 0) { |
268 | html(delim); | 268 | html(delim); |
269 | html("ofs="); | 269 | html("ofs="); |
270 | htmlf("%d", ofs); | 270 | htmlf("%d", ofs); |
271 | } | 271 | } |
272 | html("'>"); | 272 | html("'>"); |
273 | html_txt(name); | 273 | html_txt(name); |
274 | html("</a>"); | 274 | html("</a>"); |
275 | } | 275 | } |
276 | 276 | ||
277 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 277 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
278 | char *rev) | 278 | char *rev) |
279 | { | 279 | { |
280 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 280 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
281 | name[ctx.cfg.max_msg_len] = '\0'; | 281 | name[ctx.cfg.max_msg_len] = '\0'; |
282 | name[ctx.cfg.max_msg_len - 1] = '.'; | 282 | name[ctx.cfg.max_msg_len - 1] = '.'; |
283 | name[ctx.cfg.max_msg_len - 2] = '.'; | 283 | name[ctx.cfg.max_msg_len - 2] = '.'; |
284 | name[ctx.cfg.max_msg_len - 3] = '.'; | 284 | name[ctx.cfg.max_msg_len - 3] = '.'; |
285 | } | 285 | } |
286 | reporevlink("commit", name, title, class, head, rev, NULL); | 286 | reporevlink("commit", name, title, class, head, rev, NULL); |
287 | } | 287 | } |
288 | 288 | ||
289 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 289 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
290 | char *rev, char *path) | 290 | char *rev, char *path) |
291 | { | 291 | { |
292 | reporevlink("refs", name, title, class, head, rev, path); | 292 | reporevlink("refs", name, title, class, head, rev, path); |
293 | } | 293 | } |
294 | 294 | ||
295 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 295 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
296 | char *rev, char *archivename) | 296 | char *rev, char *archivename) |
297 | { | 297 | { |
298 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 298 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
299 | } | 299 | } |
300 | 300 | ||
301 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 301 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
302 | char *new_rev, char *old_rev, char *path) | 302 | char *new_rev, char *old_rev, char *path) |
303 | { | 303 | { |
304 | char *delim; | 304 | char *delim; |
305 | 305 | ||
306 | delim = repolink(title, class, "diff", head, path); | 306 | delim = repolink(title, class, "diff", head, path); |
307 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 307 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
308 | html(delim); | 308 | html(delim); |
309 | html("id="); | 309 | html("id="); |
310 | html_attr(new_rev); | 310 | html_attr(new_rev); |
311 | delim = "&"; | 311 | delim = "&"; |
312 | } | 312 | } |
313 | if (old_rev) { | 313 | if (old_rev) { |
314 | html(delim); | 314 | html(delim); |
315 | html("id2="); | 315 | html("id2="); |
316 | html_attr(old_rev); | 316 | html_attr(old_rev); |
317 | } | 317 | } |
318 | html("'>"); | 318 | html("'>"); |
319 | html_txt(name); | 319 | html_txt(name); |
320 | html("</a>"); | 320 | html("</a>"); |
321 | } | 321 | } |
322 | 322 | ||
323 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 323 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
324 | char *rev) | 324 | char *rev) |
325 | { | 325 | { |
326 | reporevlink("patch", name, title, class, head, rev, NULL); | 326 | reporevlink("patch", name, title, class, head, rev, NULL); |
327 | } | 327 | } |
328 | 328 | ||
329 | void cgit_object_link(struct object *obj) | 329 | void cgit_object_link(struct object *obj) |
330 | { | 330 | { |
331 | char *page, *arg, *url; | 331 | char *page, *arg, *url; |
332 | 332 | ||
333 | if (obj->type == OBJ_COMMIT) { | 333 | if (obj->type == OBJ_COMMIT) { |
334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
335 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 335 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
336 | return; | 336 | return; |
337 | } else if (obj->type == OBJ_TREE) { | 337 | } else if (obj->type == OBJ_TREE) { |
338 | page = "tree"; | 338 | page = "tree"; |
339 | arg = "id"; | 339 | arg = "id"; |
340 | } else if (obj->type == OBJ_TAG) { | 340 | } else if (obj->type == OBJ_TAG) { |
341 | page = "tag"; | 341 | page = "tag"; |
342 | arg = "id"; | 342 | arg = "id"; |
343 | } else { | 343 | } else { |
344 | page = "blob"; | 344 | page = "blob"; |
345 | arg = "id"; | 345 | arg = "id"; |
346 | } | 346 | } |
347 | 347 | ||
348 | url = cgit_pageurl(ctx.qry.repo, page, | 348 | url = cgit_pageurl(ctx.qry.repo, page, |
349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
350 | html_link_open(url, NULL, NULL); | 350 | html_link_open(url, NULL, NULL); |
351 | htmlf("%s %s", typename(obj->type), | 351 | htmlf("%s %s", typename(obj->type), |
352 | sha1_to_hex(obj->sha1)); | 352 | sha1_to_hex(obj->sha1)); |
353 | html_link_close(); | 353 | html_link_close(); |
354 | } | 354 | } |
355 | 355 | ||
356 | void cgit_print_date(time_t secs, char *format, int local_time) | 356 | void cgit_print_date(time_t secs, char *format, int local_time) |
357 | { | 357 | { |
358 | char buf[64]; | 358 | char buf[64]; |
359 | struct tm *time; | 359 | struct tm *time; |
360 | 360 | ||
361 | if (!secs) | 361 | if (!secs) |
362 | return; | 362 | return; |
363 | if(local_time) | 363 | if(local_time) |
364 | time = localtime(&secs); | 364 | time = localtime(&secs); |
365 | else | 365 | else |
366 | time = gmtime(&secs); | 366 | time = gmtime(&secs); |
367 | strftime(buf, sizeof(buf)-1, format, time); | 367 | strftime(buf, sizeof(buf)-1, format, time); |
368 | html_txt(buf); | 368 | html_txt(buf); |
369 | } | 369 | } |
370 | 370 | ||
371 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 371 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
372 | { | 372 | { |
373 | time_t now, secs; | 373 | time_t now, secs; |
374 | 374 | ||
375 | if (!t) | 375 | if (!t) |
376 | return; | 376 | return; |
377 | time(&now); | 377 | time(&now); |
378 | secs = now - t; | 378 | secs = now - t; |
379 | 379 | ||
380 | if (secs > max_relative && max_relative >= 0) { | 380 | if (secs > max_relative && max_relative >= 0) { |
381 | cgit_print_date(t, format, ctx.cfg.local_time); | 381 | cgit_print_date(t, format, ctx.cfg.local_time); |
382 | return; | 382 | return; |
383 | } | 383 | } |
384 | 384 | ||
385 | if (secs < TM_HOUR * 2) { | 385 | if (secs < TM_HOUR * 2) { |
386 | htmlf("<span class='age-mins'>%.0f min.</span>", | 386 | htmlf("<span class='age-mins'>%.0f min.</span>", |
387 | secs * 1.0 / TM_MIN); | 387 | secs * 1.0 / TM_MIN); |
388 | return; | 388 | return; |
389 | } | 389 | } |
390 | if (secs < TM_DAY * 2) { | 390 | if (secs < TM_DAY * 2) { |
391 | htmlf("<span class='age-hours'>%.0f hours</span>", | 391 | htmlf("<span class='age-hours'>%.0f hours</span>", |
392 | secs * 1.0 / TM_HOUR); | 392 | secs * 1.0 / TM_HOUR); |
393 | return; | 393 | return; |
394 | } | 394 | } |
395 | if (secs < TM_WEEK * 2) { | 395 | if (secs < TM_WEEK * 2) { |
396 | htmlf("<span class='age-days'>%.0f days</span>", | 396 | htmlf("<span class='age-days'>%.0f days</span>", |
397 | secs * 1.0 / TM_DAY); | 397 | secs * 1.0 / TM_DAY); |
398 | return; | 398 | return; |
399 | } | 399 | } |
400 | if (secs < TM_MONTH * 2) { | 400 | if (secs < TM_MONTH * 2) { |
401 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 401 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
402 | secs * 1.0 / TM_WEEK); | 402 | secs * 1.0 / TM_WEEK); |
403 | return; | 403 | return; |
404 | } | 404 | } |
405 | if (secs < TM_YEAR * 2) { | 405 | if (secs < TM_YEAR * 2) { |
406 | htmlf("<span class='age-months'>%.0f months</span>", | 406 | htmlf("<span class='age-months'>%.0f months</span>", |
407 | secs * 1.0 / TM_MONTH); | 407 | secs * 1.0 / TM_MONTH); |
408 | return; | 408 | return; |
409 | } | 409 | } |
410 | htmlf("<span class='age-years'>%.0f years</span>", | 410 | htmlf("<span class='age-years'>%.0f years</span>", |
411 | secs * 1.0 / TM_YEAR); | 411 | secs * 1.0 / TM_YEAR); |
412 | } | 412 | } |
413 | 413 | ||
414 | void cgit_print_http_headers(struct cgit_context *ctx) | 414 | void cgit_print_http_headers(struct cgit_context *ctx) |
415 | { | 415 | { |
416 | if (ctx->page.mimetype && ctx->page.charset) | 416 | if (ctx->page.mimetype && ctx->page.charset) |
417 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 417 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
418 | ctx->page.charset); | 418 | ctx->page.charset); |
419 | else if (ctx->page.mimetype) | 419 | else if (ctx->page.mimetype) |
420 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 420 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
421 | if (ctx->page.size) | ||
422 | htmlf("Content-Length: %ld\n", ctx->page.size); | ||
421 | if (ctx->page.filename) | 423 | if (ctx->page.filename) |
422 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 424 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
423 | ctx->page.filename); | 425 | ctx->page.filename); |
424 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 426 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
425 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 427 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
426 | html("\n"); | 428 | html("\n"); |
427 | } | 429 | } |
428 | 430 | ||
429 | void cgit_print_docstart(struct cgit_context *ctx) | 431 | void cgit_print_docstart(struct cgit_context *ctx) |
430 | { | 432 | { |
431 | html(cgit_doctype); | 433 | html(cgit_doctype); |
432 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 434 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
433 | html("<head>\n"); | 435 | html("<head>\n"); |
434 | html("<title>"); | 436 | html("<title>"); |
435 | html_txt(ctx->page.title); | 437 | html_txt(ctx->page.title); |
436 | html("</title>\n"); | 438 | html("</title>\n"); |
437 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 439 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
438 | if (ctx->cfg.robots && *ctx->cfg.robots) | 440 | if (ctx->cfg.robots && *ctx->cfg.robots) |
439 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 441 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
440 | html("<link rel='stylesheet' type='text/css' href='"); | 442 | html("<link rel='stylesheet' type='text/css' href='"); |
441 | html_attr(ctx->cfg.css); | 443 | html_attr(ctx->cfg.css); |
442 | html("'/>\n"); | 444 | html("'/>\n"); |
443 | if (ctx->cfg.favicon) { | 445 | if (ctx->cfg.favicon) { |
444 | html("<link rel='shortcut icon' href='"); | 446 | html("<link rel='shortcut icon' href='"); |
445 | html_attr(ctx->cfg.favicon); | 447 | html_attr(ctx->cfg.favicon); |
446 | html("'/>\n"); | 448 | html("'/>\n"); |
447 | } | 449 | } |
448 | html("</head>\n"); | 450 | html("</head>\n"); |
449 | html("<body>\n"); | 451 | html("<body>\n"); |
450 | } | 452 | } |
451 | 453 | ||
452 | void cgit_print_docend() | 454 | void cgit_print_docend() |
453 | { | 455 | { |
454 | html("</div>"); | 456 | html("</div>"); |
455 | if (ctx.cfg.footer) | 457 | if (ctx.cfg.footer) |
456 | html_include(ctx.cfg.footer); | 458 | html_include(ctx.cfg.footer); |
457 | else { | 459 | else { |
458 | html("<div class='footer'>generated "); | 460 | html("<div class='footer'>generated "); |
459 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 461 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
460 | htmlf(" by cgit %s", cgit_version); | 462 | htmlf(" by cgit %s", cgit_version); |
461 | html("</div>\n"); | 463 | html("</div>\n"); |
462 | } | 464 | } |
463 | html("</body>\n</html>\n"); | 465 | html("</body>\n</html>\n"); |
464 | } | 466 | } |
465 | 467 | ||
466 | int print_branch_option(const char *refname, const unsigned char *sha1, | 468 | int print_branch_option(const char *refname, const unsigned char *sha1, |
467 | int flags, void *cb_data) | 469 | int flags, void *cb_data) |
468 | { | 470 | { |
469 | char *name = (char *)refname; | 471 | char *name = (char *)refname; |
470 | html_option(name, name, ctx.qry.head); | 472 | html_option(name, name, ctx.qry.head); |
471 | return 0; | 473 | return 0; |
472 | } | 474 | } |
473 | 475 | ||
474 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 476 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
475 | int flags, void *cb_data) | 477 | int flags, void *cb_data) |
476 | { | 478 | { |
477 | struct tag *tag; | 479 | struct tag *tag; |
478 | struct taginfo *info; | 480 | struct taginfo *info; |
479 | struct object *obj; | 481 | struct object *obj; |
480 | char buf[256], *url; | 482 | char buf[256], *url; |
481 | unsigned char fileid[20]; | 483 | unsigned char fileid[20]; |
482 | int *header = (int *)cb_data; | 484 | int *header = (int *)cb_data; |
483 | 485 | ||
484 | if (prefixcmp(refname, "refs/archives")) | 486 | if (prefixcmp(refname, "refs/archives")) |
485 | return 0; | 487 | return 0; |
486 | strncpy(buf, refname+14, sizeof(buf)); | 488 | strncpy(buf, refname+14, sizeof(buf)); |
487 | obj = parse_object(sha1); | 489 | obj = parse_object(sha1); |
488 | if (!obj) | 490 | if (!obj) |
489 | return 1; | 491 | return 1; |
490 | if (obj->type == OBJ_TAG) { | 492 | if (obj->type == OBJ_TAG) { |
491 | tag = lookup_tag(sha1); | 493 | tag = lookup_tag(sha1); |
492 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 494 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
493 | return 0; | 495 | return 0; |
494 | hashcpy(fileid, tag->tagged->sha1); | 496 | hashcpy(fileid, tag->tagged->sha1); |
495 | } else if (obj->type != OBJ_BLOB) { | 497 | } else if (obj->type != OBJ_BLOB) { |
496 | return 0; | 498 | return 0; |
497 | } else { | 499 | } else { |
498 | hashcpy(fileid, sha1); | 500 | hashcpy(fileid, sha1); |
499 | } | 501 | } |
500 | if (!*header) { | 502 | if (!*header) { |
501 | html("<h1>download</h1>\n"); | 503 | html("<h1>download</h1>\n"); |
502 | *header = 1; | 504 | *header = 1; |
503 | } | 505 | } |
504 | url = cgit_pageurl(ctx.qry.repo, "blob", | 506 | url = cgit_pageurl(ctx.qry.repo, "blob", |
505 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 507 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
506 | buf)); | 508 | buf)); |
507 | html_link_open(url, NULL, "menu"); | 509 | html_link_open(url, NULL, "menu"); |
508 | html_txt(strlpart(buf, 20)); | 510 | html_txt(strlpart(buf, 20)); |
509 | html_link_close(); | 511 | html_link_close(); |
510 | return 0; | 512 | return 0; |
511 | } | 513 | } |
512 | 514 | ||
513 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 515 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
514 | { | 516 | { |
515 | char *url; | 517 | char *url; |
516 | 518 | ||
517 | if (!ctx.cfg.virtual_root) { | 519 | if (!ctx.cfg.virtual_root) { |
518 | url = fmt("%s/%s", ctx.qry.repo, page); | 520 | url = fmt("%s/%s", ctx.qry.repo, page); |
519 | if (ctx.qry.path) | 521 | if (ctx.qry.path) |
520 | url = fmt("%s/%s", url, ctx.qry.path); | 522 | url = fmt("%s/%s", url, ctx.qry.path); |
521 | html_hidden("url", url); | 523 | html_hidden("url", url); |
522 | } | 524 | } |
523 | 525 | ||
524 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 526 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
525 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 527 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
526 | html_hidden("h", ctx.qry.head); | 528 | html_hidden("h", ctx.qry.head); |
527 | 529 | ||
528 | if (ctx.qry.sha1) | 530 | if (ctx.qry.sha1) |
529 | html_hidden("id", ctx.qry.sha1); | 531 | html_hidden("id", ctx.qry.sha1); |
530 | if (ctx.qry.sha2) | 532 | if (ctx.qry.sha2) |
531 | html_hidden("id2", ctx.qry.sha2); | 533 | html_hidden("id2", ctx.qry.sha2); |
532 | 534 | ||
533 | if (incl_search) { | 535 | if (incl_search) { |
534 | if (ctx.qry.grep) | 536 | if (ctx.qry.grep) |
535 | html_hidden("qt", ctx.qry.grep); | 537 | html_hidden("qt", ctx.qry.grep); |
536 | if (ctx.qry.search) | 538 | if (ctx.qry.search) |
537 | html_hidden("q", ctx.qry.search); | 539 | html_hidden("q", ctx.qry.search); |
538 | } | 540 | } |
539 | } | 541 | } |
540 | 542 | ||
541 | char *hc(struct cgit_cmd *cmd, const char *page) | 543 | char *hc(struct cgit_cmd *cmd, const char *page) |
542 | { | 544 | { |
543 | return (strcmp(cmd->name, page) ? NULL : "active"); | 545 | return (strcmp(cmd->name, page) ? NULL : "active"); |
544 | } | 546 | } |
545 | 547 | ||
546 | void cgit_print_pageheader(struct cgit_context *ctx) | 548 | void cgit_print_pageheader(struct cgit_context *ctx) |
547 | { | 549 | { |
548 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 550 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
549 | 551 | ||
550 | html("<table id='header'>\n"); | 552 | html("<table id='header'>\n"); |
551 | html("<tr>\n"); | 553 | html("<tr>\n"); |
552 | html("<td class='logo' rowspan='2'><a href='"); | 554 | html("<td class='logo' rowspan='2'><a href='"); |
553 | if (ctx->cfg.logo_link) | 555 | if (ctx->cfg.logo_link) |
554 | html_attr(ctx->cfg.logo_link); | 556 | html_attr(ctx->cfg.logo_link); |
555 | else | 557 | else |
556 | html_attr(cgit_rooturl()); | 558 | html_attr(cgit_rooturl()); |
557 | html("'><img src='"); | 559 | html("'><img src='"); |
558 | html_attr(ctx->cfg.logo); | 560 | html_attr(ctx->cfg.logo); |
559 | html("' alt='cgit logo'/></a></td>\n"); | 561 | html("' alt='cgit logo'/></a></td>\n"); |
560 | 562 | ||
561 | html("<td class='main'>"); | 563 | html("<td class='main'>"); |
562 | if (ctx->repo) { | 564 | if (ctx->repo) { |
563 | cgit_index_link("index", NULL, NULL, NULL, 0); | 565 | cgit_index_link("index", NULL, NULL, NULL, 0); |
564 | html(" : "); | 566 | html(" : "); |
565 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), | 567 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), |
566 | ctx->qry.head, NULL, NULL); | 568 | ctx->qry.head, NULL, NULL); |
567 | html("</td><td class='form'>"); | 569 | html("</td><td class='form'>"); |
568 | html("<form method='get' action=''>\n"); | 570 | html("<form method='get' action=''>\n"); |
569 | add_hidden_formfields(0, 1, ctx->qry.page); | 571 | add_hidden_formfields(0, 1, ctx->qry.page); |
570 | html("<select name='h' onchange='this.form.submit();'>\n"); | 572 | html("<select name='h' onchange='this.form.submit();'>\n"); |
571 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 573 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
572 | html("</select> "); | 574 | html("</select> "); |
573 | html("<input type='submit' name='' value='switch'/>"); | 575 | html("<input type='submit' name='' value='switch'/>"); |
574 | html("</form>"); | 576 | html("</form>"); |
575 | } else | 577 | } else |
576 | html_txt(ctx->cfg.root_title); | 578 | html_txt(ctx->cfg.root_title); |
577 | html("</td></tr>\n"); | 579 | html("</td></tr>\n"); |
578 | 580 | ||
579 | html("<tr><td class='sub'>"); | 581 | html("<tr><td class='sub'>"); |
580 | if (ctx->repo) { | 582 | if (ctx->repo) { |
581 | html_txt(ctx->repo->desc); | 583 | html_txt(ctx->repo->desc); |
582 | html("</td><td class='sub right'>"); | 584 | html("</td><td class='sub right'>"); |
583 | html_txt(ctx->repo->owner); | 585 | html_txt(ctx->repo->owner); |
584 | } else { | 586 | } else { |
585 | if (ctx->cfg.root_desc) | 587 | if (ctx->cfg.root_desc) |
586 | html_txt(ctx->cfg.root_desc); | 588 | html_txt(ctx->cfg.root_desc); |
587 | else if (ctx->cfg.index_info) | 589 | else if (ctx->cfg.index_info) |
588 | html_include(ctx->cfg.index_info); | 590 | html_include(ctx->cfg.index_info); |
589 | } | 591 | } |
590 | html("</td></tr></table>\n"); | 592 | html("</td></tr></table>\n"); |
591 | 593 | ||
592 | html("<table class='tabs'><tr><td>\n"); | 594 | html("<table class='tabs'><tr><td>\n"); |
593 | if (ctx->repo) { | 595 | if (ctx->repo) { |
594 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 596 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
595 | ctx->qry.head, NULL, NULL); | 597 | ctx->qry.head, NULL, NULL); |
596 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 598 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
597 | ctx->qry.sha1, NULL); | 599 | ctx->qry.sha1, NULL); |
598 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 600 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
599 | NULL, NULL, 0, NULL, NULL); | 601 | NULL, NULL, 0, NULL, NULL); |
600 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 602 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
601 | ctx->qry.sha1, NULL); | 603 | ctx->qry.sha1, NULL); |
602 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 604 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
603 | ctx->qry.head, ctx->qry.sha1); | 605 | ctx->qry.head, ctx->qry.sha1); |
604 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 606 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
605 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 607 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
606 | if (ctx->repo->readme) | 608 | if (ctx->repo->readme) |
607 | reporevlink("about", "about", NULL, | 609 | reporevlink("about", "about", NULL, |
608 | hc(cmd, "about"), ctx->qry.head, NULL, | 610 | hc(cmd, "about"), ctx->qry.head, NULL, |
609 | NULL); | 611 | NULL); |
610 | html("</td><td class='form'>"); | 612 | html("</td><td class='form'>"); |
611 | html("<form class='right' method='get' action='"); | 613 | html("<form class='right' method='get' action='"); |
612 | if (ctx->cfg.virtual_root) | 614 | if (ctx->cfg.virtual_root) |