summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-10-27 08:36:53 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-10-27 08:53:27 (UTC)
commit7937d06090dd5e19145ec6fa8befc5770954b30c (patch) (unidiff)
treebb058aa0b5e54aabcad6a2ca6416bcac4b636615
parent8efb05f98ad389d1b7f5aac17838401908622dad (diff)
downloadcgit-7937d06090dd5e19145ec6fa8befc5770954b30c.zip
cgit-7937d06090dd5e19145ec6fa8befc5770954b30c.tar.gz
cgit-7937d06090dd5e19145ec6fa8befc5770954b30c.tar.bz2
Add support for refs view
This enables the new urls $repo/refs, $repo/refs/heads and $repo/refs/tags, which can be used to print _all_ branches and/or tags. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--cgit.c3
-rw-r--r--cgit.h2
-rw-r--r--shared.c2
-rw-r--r--ui-refs.c30
5 files changed, 37 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8e3da72..36b5ff6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,72 +1,72 @@
1CGIT_VERSION = v0.6.3 1CGIT_VERSION = v0.6.3
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.3 7GIT_VER = 1.5.3.3
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_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
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
19 ui-snapshot.o ui-blob.o ui-tag.o 19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
20 20
21 21
22.PHONY: all git install clean distclean force-version get-git 22.PHONY: all git install clean distclean force-version get-git
23 23
24all: cgit git 24all: cgit git
25 25
26VERSION: force-version 26VERSION: force-version
27 @./gen-version.sh "$(CGIT_VERSION)" 27 @./gen-version.sh "$(CGIT_VERSION)"
28-include VERSION 28-include VERSION
29 29
30 30
31CFLAGS += -g -Wall -Igit 31CFLAGS += -g -Wall -Igit
32CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 32CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
33CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 33CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
34CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 34CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
35CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 35CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
36CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 36CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
37 37
38 38
39cgit: cgit.c $(OBJECTS) 39cgit: cgit.c $(OBJECTS)
40 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 40 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
41 41
42$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION 42$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
43 43
44git/xdiff/lib.a: | git 44git/xdiff/lib.a: | git
45 45
46git/libgit.a: | git 46git/libgit.a: | git
47 47
48git: 48git:
49 cd git && $(MAKE) xdiff/lib.a 49 cd git && $(MAKE) xdiff/lib.a
50 cd git && $(MAKE) libgit.a 50 cd git && $(MAKE) libgit.a
51 51
52install: all 52install: all
53 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 53 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
54 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 54 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
55 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 55 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
56 rm -rf $(DESTDIR)$(CACHE_ROOT)/* 56 rm -rf $(DESTDIR)$(CACHE_ROOT)/*
57 57
58uninstall: 58uninstall:
59 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 59 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
60 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 60 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
61 rm -rf $(CACHE_ROOT) 61 rm -rf $(CACHE_ROOT)
62 62
63clean: 63clean:
64 rm -f cgit VERSION *.o 64 rm -f cgit VERSION *.o
65 cd git && $(MAKE) clean 65 cd git && $(MAKE) clean
66 66
67distclean: clean 67distclean: clean
68 git clean -d -x 68 git clean -d -x
69 cd git && git clean -d -x 69 cd git && git clean -d -x
70 70
71get-git: 71get-git:
72 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git 72 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cgit.c b/cgit.c
index 1b85b15..cc18ed4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,256 +1,259 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11static int cgit_prepare_cache(struct cacheitem *item) 11static int cgit_prepare_cache(struct cacheitem *item)
12{ 12{
13 if (!cgit_repo && cgit_query_repo) { 13 if (!cgit_repo && cgit_query_repo) {
14 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 14 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
15 cgit_print_docstart(title, item); 15 cgit_print_docstart(title, item);
16 cgit_print_pageheader(title, 0); 16 cgit_print_pageheader(title, 0);
17 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); 17 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
18 cgit_print_docend(); 18 cgit_print_docend();
19 return 0; 19 return 0;
20 } 20 }
21 21
22 if (!cgit_repo) { 22 if (!cgit_repo) {
23 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); 23 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
24 item->ttl = cgit_cache_root_ttl; 24 item->ttl = cgit_cache_root_ttl;
25 return 1; 25 return 1;
26 } 26 }
27 27
28 if (!cgit_cmd) { 28 if (!cgit_cmd) {
29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, 29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
30 cache_safe_filename(cgit_repo->url), 30 cache_safe_filename(cgit_repo->url),
31 cache_safe_filename(cgit_querystring))); 31 cache_safe_filename(cgit_querystring)));
32 item->ttl = cgit_cache_repo_ttl; 32 item->ttl = cgit_cache_repo_ttl;
33 } else { 33 } else {
34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
35 cache_safe_filename(cgit_repo->url), 35 cache_safe_filename(cgit_repo->url),
36 cgit_query_page, 36 cgit_query_page,
37 cache_safe_filename(cgit_querystring))); 37 cache_safe_filename(cgit_querystring)));
38 if (cgit_query_has_symref) 38 if (cgit_query_has_symref)
39 item->ttl = cgit_cache_dynamic_ttl; 39 item->ttl = cgit_cache_dynamic_ttl;
40 else if (cgit_query_has_sha1) 40 else if (cgit_query_has_sha1)
41 item->ttl = cgit_cache_static_ttl; 41 item->ttl = cgit_cache_static_ttl;
42 else 42 else
43 item->ttl = cgit_cache_repo_ttl; 43 item->ttl = cgit_cache_repo_ttl;
44 } 44 }
45 return 1; 45 return 1;
46} 46}
47 47
48static void cgit_print_repo_page(struct cacheitem *item) 48static void cgit_print_repo_page(struct cacheitem *item)
49{ 49{
50 char *title; 50 char *title;
51 int show_search; 51 int show_search;
52 52
53 if (!cgit_query_head) 53 if (!cgit_query_head)
54 cgit_query_head = cgit_repo->defbranch; 54 cgit_query_head = cgit_repo->defbranch;
55 55
56 if (chdir(cgit_repo->path)) { 56 if (chdir(cgit_repo->path)) {
57 title = fmt("%s - %s", cgit_root_title, "Bad request"); 57 title = fmt("%s - %s", cgit_root_title, "Bad request");
58 cgit_print_docstart(title, item); 58 cgit_print_docstart(title, item);
59 cgit_print_pageheader(title, 0); 59 cgit_print_pageheader(title, 0);
60 cgit_print_error(fmt("Unable to scan repository: %s", 60 cgit_print_error(fmt("Unable to scan repository: %s",
61 strerror(errno))); 61 strerror(errno)));
62 cgit_print_docend(); 62 cgit_print_docend();
63 return; 63 return;
64 } 64 }
65 65
66 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); 66 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
67 show_search = 0; 67 show_search = 0;
68 setenv("GIT_DIR", cgit_repo->path, 1); 68 setenv("GIT_DIR", cgit_repo->path, 1);
69 69
70 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { 70 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
71 cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, 71 cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
72 cgit_repobasename(cgit_repo->url), 72 cgit_repobasename(cgit_repo->url),
73 cgit_query_path, 73 cgit_query_path,
74 cgit_repo->snapshots ); 74 cgit_repo->snapshots );
75 return; 75 return;
76 } 76 }
77 77
78 if (cgit_cmd == CMD_BLOB) { 78 if (cgit_cmd == CMD_BLOB) {
79 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 79 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
80 return; 80 return;
81 } 81 }
82 82
83 show_search = (cgit_cmd == CMD_LOG); 83 show_search = (cgit_cmd == CMD_LOG);
84 cgit_print_docstart(title, item); 84 cgit_print_docstart(title, item);
85 if (!cgit_cmd) { 85 if (!cgit_cmd) {
86 cgit_print_pageheader("summary", show_search); 86 cgit_print_pageheader("summary", show_search);
87 cgit_print_summary(); 87 cgit_print_summary();
88 cgit_print_docend(); 88 cgit_print_docend();
89 return; 89 return;
90 } 90 }
91 91
92 cgit_print_pageheader(cgit_query_page, show_search); 92 cgit_print_pageheader(cgit_query_page, show_search);
93 93
94 switch(cgit_cmd) { 94 switch(cgit_cmd) {
95 case CMD_LOG: 95 case CMD_LOG:
96 cgit_print_log(cgit_query_sha1, cgit_query_ofs, 96 cgit_print_log(cgit_query_sha1, cgit_query_ofs,
97 cgit_max_commit_count, cgit_query_search, 97 cgit_max_commit_count, cgit_query_search,
98 cgit_query_path, 1); 98 cgit_query_path, 1);
99 break; 99 break;
100 case CMD_TREE: 100 case CMD_TREE:
101 cgit_print_tree(cgit_query_sha1, cgit_query_path); 101 cgit_print_tree(cgit_query_sha1, cgit_query_path);
102 break; 102 break;
103 case CMD_COMMIT: 103 case CMD_COMMIT:
104 cgit_print_commit(cgit_query_sha1); 104 cgit_print_commit(cgit_query_sha1);
105 break; 105 break;
106 case CMD_REFS:
107 cgit_print_refs();
108 break;
106 case CMD_TAG: 109 case CMD_TAG:
107 cgit_print_tag(cgit_query_sha1); 110 cgit_print_tag(cgit_query_sha1);
108 break; 111 break;
109 case CMD_DIFF: 112 case CMD_DIFF:
110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); 113 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
111 break; 114 break;
112 default: 115 default:
113 cgit_print_error("Invalid request"); 116 cgit_print_error("Invalid request");
114 } 117 }
115 cgit_print_docend(); 118 cgit_print_docend();
116} 119}
117 120
118static void cgit_fill_cache(struct cacheitem *item, int use_cache) 121static void cgit_fill_cache(struct cacheitem *item, int use_cache)
119{ 122{
120 static char buf[PATH_MAX]; 123 static char buf[PATH_MAX];
121 int stdout2; 124 int stdout2;
122 125
123 getcwd(buf, sizeof(buf)); 126 getcwd(buf, sizeof(buf));
124 item->st.st_mtime = time(NULL); 127 item->st.st_mtime = time(NULL);
125 128
126 if (use_cache) { 129 if (use_cache) {
127 stdout2 = chk_positive(dup(STDOUT_FILENO), 130 stdout2 = chk_positive(dup(STDOUT_FILENO),
128 "Preserving STDOUT"); 131 "Preserving STDOUT");
129 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 132 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 133 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
131 } 134 }
132 135
133 if (cgit_repo) 136 if (cgit_repo)
134 cgit_print_repo_page(item); 137 cgit_print_repo_page(item);
135 else 138 else
136 cgit_print_repolist(item); 139 cgit_print_repolist(item);
137 140
138 if (use_cache) { 141 if (use_cache) {
139 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 142 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
140 chk_positive(dup2(stdout2, STDOUT_FILENO), 143 chk_positive(dup2(stdout2, STDOUT_FILENO),
141 "Restoring original STDOUT"); 144 "Restoring original STDOUT");
142 chk_zero(close(stdout2), "Closing temporary STDOUT"); 145 chk_zero(close(stdout2), "Closing temporary STDOUT");
143 } 146 }
144 147
145 chdir(buf); 148 chdir(buf);
146} 149}
147 150
148static void cgit_check_cache(struct cacheitem *item) 151static void cgit_check_cache(struct cacheitem *item)
149{ 152{
150 int i = 0; 153 int i = 0;
151 154
152 top: 155 top:
153 if (++i > cgit_max_lock_attempts) { 156 if (++i > cgit_max_lock_attempts) {
154 die("cgit_refresh_cache: unable to lock %s: %s", 157 die("cgit_refresh_cache: unable to lock %s: %s",
155 item->name, strerror(errno)); 158 item->name, strerror(errno));
156 } 159 }
157 if (!cache_exist(item)) { 160 if (!cache_exist(item)) {
158 if (!cache_lock(item)) { 161 if (!cache_lock(item)) {
159 sleep(1); 162 sleep(1);
160 goto top; 163 goto top;
161 } 164 }
162 if (!cache_exist(item)) { 165 if (!cache_exist(item)) {
163 cgit_fill_cache(item, 1); 166 cgit_fill_cache(item, 1);
164 cache_unlock(item); 167 cache_unlock(item);
165 } else { 168 } else {
166 cache_cancel_lock(item); 169 cache_cancel_lock(item);
167 } 170 }
168 } else if (cache_expired(item) && cache_lock(item)) { 171 } else if (cache_expired(item) && cache_lock(item)) {
169 if (cache_expired(item)) { 172 if (cache_expired(item)) {
170 cgit_fill_cache(item, 1); 173 cgit_fill_cache(item, 1);
171 cache_unlock(item); 174 cache_unlock(item);
172 } else { 175 } else {
173 cache_cancel_lock(item); 176 cache_cancel_lock(item);
174 } 177 }
175 } 178 }
176} 179}
177 180
178static void cgit_print_cache(struct cacheitem *item) 181static void cgit_print_cache(struct cacheitem *item)
179{ 182{
180 static char buf[4096]; 183 static char buf[4096];
181 ssize_t i; 184 ssize_t i;
182 185
183 int fd = open(item->name, O_RDONLY); 186 int fd = open(item->name, O_RDONLY);
184 if (fd<0) 187 if (fd<0)
185 die("Unable to open cached file %s", item->name); 188 die("Unable to open cached file %s", item->name);
186 189
187 while((i=read(fd, buf, sizeof(buf))) > 0) 190 while((i=read(fd, buf, sizeof(buf))) > 0)
188 write(STDOUT_FILENO, buf, i); 191 write(STDOUT_FILENO, buf, i);
189 192
190 close(fd); 193 close(fd);
191} 194}
192 195
193static void cgit_parse_args(int argc, const char **argv) 196static void cgit_parse_args(int argc, const char **argv)
194{ 197{
195 int i; 198 int i;
196 199
197 for (i = 1; i < argc; i++) { 200 for (i = 1; i < argc; i++) {
198 if (!strncmp(argv[i], "--cache=", 8)) { 201 if (!strncmp(argv[i], "--cache=", 8)) {
199 cgit_cache_root = xstrdup(argv[i]+8); 202 cgit_cache_root = xstrdup(argv[i]+8);
200 } 203 }
201 if (!strcmp(argv[i], "--nocache")) { 204 if (!strcmp(argv[i], "--nocache")) {
202 cgit_nocache = 1; 205 cgit_nocache = 1;
203 } 206 }
204 if (!strncmp(argv[i], "--query=", 8)) { 207 if (!strncmp(argv[i], "--query=", 8)) {
205 cgit_querystring = xstrdup(argv[i]+8); 208 cgit_querystring = xstrdup(argv[i]+8);
206 } 209 }
207 if (!strncmp(argv[i], "--repo=", 7)) { 210 if (!strncmp(argv[i], "--repo=", 7)) {
208 cgit_query_repo = xstrdup(argv[i]+7); 211 cgit_query_repo = xstrdup(argv[i]+7);
209 } 212 }
210 if (!strncmp(argv[i], "--page=", 7)) { 213 if (!strncmp(argv[i], "--page=", 7)) {
211 cgit_query_page = xstrdup(argv[i]+7); 214 cgit_query_page = xstrdup(argv[i]+7);
212 } 215 }
213 if (!strncmp(argv[i], "--head=", 7)) { 216 if (!strncmp(argv[i], "--head=", 7)) {
214 cgit_query_head = xstrdup(argv[i]+7); 217 cgit_query_head = xstrdup(argv[i]+7);
215 cgit_query_has_symref = 1; 218 cgit_query_has_symref = 1;
216 } 219 }
217 if (!strncmp(argv[i], "--sha1=", 7)) { 220 if (!strncmp(argv[i], "--sha1=", 7)) {
218 cgit_query_sha1 = xstrdup(argv[i]+7); 221 cgit_query_sha1 = xstrdup(argv[i]+7);
219 cgit_query_has_sha1 = 1; 222 cgit_query_has_sha1 = 1;
220 } 223 }
221 if (!strncmp(argv[i], "--ofs=", 6)) { 224 if (!strncmp(argv[i], "--ofs=", 6)) {
222 cgit_query_ofs = atoi(argv[i]+6); 225 cgit_query_ofs = atoi(argv[i]+6);
223 } 226 }
224 } 227 }
225} 228}
226 229
227int main(int argc, const char **argv) 230int main(int argc, const char **argv)
228{ 231{
229 struct cacheitem item; 232 struct cacheitem item;
230 const char *cgit_config_env = getenv("CGIT_CONFIG"); 233 const char *cgit_config_env = getenv("CGIT_CONFIG");
231 234
232 htmlfd = STDOUT_FILENO; 235 htmlfd = STDOUT_FILENO;
233 item.st.st_mtime = time(NULL); 236 item.st.st_mtime = time(NULL);
234 cgit_repolist.length = 0; 237 cgit_repolist.length = 0;
235 cgit_repolist.count = 0; 238 cgit_repolist.count = 0;
236 cgit_repolist.repos = NULL; 239 cgit_repolist.repos = NULL;
237 240
238 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 241 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
239 cgit_global_config_cb); 242 cgit_global_config_cb);
240 cgit_repo = NULL; 243 cgit_repo = NULL;
241 if (getenv("SCRIPT_NAME")) 244 if (getenv("SCRIPT_NAME"))
242 cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); 245 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
243 if (getenv("QUERY_STRING")) 246 if (getenv("QUERY_STRING"))
244 cgit_querystring = xstrdup(getenv("QUERY_STRING")); 247 cgit_querystring = xstrdup(getenv("QUERY_STRING"));
245 cgit_parse_args(argc, argv); 248 cgit_parse_args(argc, argv);
246 cgit_parse_query(cgit_querystring, cgit_querystring_cb); 249 cgit_parse_query(cgit_querystring, cgit_querystring_cb);
247 if (!cgit_prepare_cache(&item)) 250 if (!cgit_prepare_cache(&item))
248 return 0; 251 return 0;
249 if (cgit_nocache) { 252 if (cgit_nocache) {
250 cgit_fill_cache(&item, 0); 253 cgit_fill_cache(&item, 0);
251 } else { 254 } else {
252 cgit_check_cache(&item); 255 cgit_check_cache(&item);
253 cgit_print_cache(&item); 256 cgit_print_cache(&item);
254 } 257 }
255 return 0; 258 return 0;
256} 259}
diff --git a/cgit.h b/cgit.h
index a1fe527..d9a15f4 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,272 +1,274 @@
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 19
20 20
21/* 21/*
22 * The valid cgit repo-commands 22 * The valid cgit repo-commands
23 */ 23 */
24#define CMD_LOG 1 24#define CMD_LOG 1
25#define CMD_COMMIT 2 25#define CMD_COMMIT 2
26#define CMD_DIFF 3 26#define CMD_DIFF 3
27#define CMD_TREE 4 27#define CMD_TREE 4
28#define CMD_BLOB 5 28#define CMD_BLOB 5
29#define CMD_SNAPSHOT 6 29#define CMD_SNAPSHOT 6
30#define CMD_TAG 7 30#define CMD_TAG 7
31#define CMD_REFS 8
31 32
32/* 33/*
33 * Dateformats used on misc. pages 34 * Dateformats used on misc. pages
34 */ 35 */
35#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" 36#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
36#define FMT_SHORTDATE "%Y-%m-%d" 37#define FMT_SHORTDATE "%Y-%m-%d"
37 38
38 39
39/* 40/*
40 * Limits used for relative dates 41 * Limits used for relative dates
41 */ 42 */
42#define TM_MIN 60 43#define TM_MIN 60
43#define TM_HOUR (TM_MIN * 60) 44#define TM_HOUR (TM_MIN * 60)
44#define TM_DAY (TM_HOUR * 24) 45#define TM_DAY (TM_HOUR * 24)
45#define TM_WEEK (TM_DAY * 7) 46#define TM_WEEK (TM_DAY * 7)
46#define TM_YEAR (TM_DAY * 365) 47#define TM_YEAR (TM_DAY * 365)
47#define TM_MONTH (TM_YEAR / 12.0) 48#define TM_MONTH (TM_YEAR / 12.0)
48 49
49 50
50typedef void (*configfn)(const char *name, const char *value); 51typedef void (*configfn)(const char *name, const char *value);
51typedef void (*filepair_fn)(struct diff_filepair *pair); 52typedef void (*filepair_fn)(struct diff_filepair *pair);
52typedef void (*linediff_fn)(char *line, int len); 53typedef void (*linediff_fn)(char *line, int len);
53 54
54struct cacheitem { 55struct cacheitem {
55 char *name; 56 char *name;
56 struct stat st; 57 struct stat st;
57 int ttl; 58 int ttl;
58 int fd; 59 int fd;
59}; 60};
60 61
61struct repoinfo { 62struct repoinfo {
62 char *url; 63 char *url;
63 char *name; 64 char *name;
64 char *path; 65 char *path;
65 char *desc; 66 char *desc;
66 char *owner; 67 char *owner;
67 char *defbranch; 68 char *defbranch;
68 char *group; 69 char *group;
69 char *module_link; 70 char *module_link;
70 char *readme; 71 char *readme;
71 int snapshots; 72 int snapshots;
72 int enable_log_filecount; 73 int enable_log_filecount;
73 int enable_log_linecount; 74 int enable_log_linecount;
74}; 75};
75 76
76struct repolist { 77struct repolist {
77 int length; 78 int length;
78 int count; 79 int count;
79 struct repoinfo *repos; 80 struct repoinfo *repos;
80}; 81};
81 82
82struct commitinfo { 83struct commitinfo {
83 struct commit *commit; 84 struct commit *commit;
84 char *author; 85 char *author;
85 char *author_email; 86 char *author_email;
86 unsigned long author_date; 87 unsigned long author_date;
87 char *committer; 88 char *committer;
88 char *committer_email; 89 char *committer_email;
89 unsigned long committer_date; 90 unsigned long committer_date;
90 char *subject; 91 char *subject;
91 char *msg; 92 char *msg;
92}; 93};
93 94
94struct taginfo { 95struct taginfo {
95 char *tagger; 96 char *tagger;
96 char *tagger_email; 97 char *tagger_email;
97 int tagger_date; 98 int tagger_date;
98 char *msg; 99 char *msg;
99}; 100};
100 101
101struct refinfo { 102struct refinfo {
102 const char *refname; 103 const char *refname;
103 struct object *object; 104 struct object *object;
104 union { 105 union {
105 struct taginfo *tag; 106 struct taginfo *tag;
106 struct commitinfo *commit; 107 struct commitinfo *commit;
107 }; 108 };
108}; 109};
109 110
110struct reflist { 111struct reflist {
111 struct refinfo **refs; 112 struct refinfo **refs;
112 int alloc; 113 int alloc;
113 int count; 114 int count;
114}; 115};
115 116
116extern const char *cgit_version; 117extern const char *cgit_version;
117 118
118extern struct repolist cgit_repolist; 119extern struct repolist cgit_repolist;
119extern struct repoinfo *cgit_repo; 120extern struct repoinfo *cgit_repo;
120extern int cgit_cmd; 121extern int cgit_cmd;
121 122
122extern char *cgit_root_title; 123extern char *cgit_root_title;
123extern char *cgit_css; 124extern char *cgit_css;
124extern char *cgit_logo; 125extern char *cgit_logo;
125extern char *cgit_index_header; 126extern char *cgit_index_header;
126extern char *cgit_logo_link; 127extern char *cgit_logo_link;
127extern char *cgit_module_link; 128extern char *cgit_module_link;
128extern char *cgit_agefile; 129extern char *cgit_agefile;
129extern char *cgit_virtual_root; 130extern char *cgit_virtual_root;
130extern char *cgit_script_name; 131extern char *cgit_script_name;
131extern char *cgit_cache_root; 132extern char *cgit_cache_root;
132extern char *cgit_repo_group; 133extern char *cgit_repo_group;
133 134
134extern int cgit_nocache; 135extern int cgit_nocache;
135extern int cgit_snapshots; 136extern int cgit_snapshots;
136extern int cgit_enable_index_links; 137extern int cgit_enable_index_links;
137extern int cgit_enable_log_filecount; 138extern int cgit_enable_log_filecount;
138extern int cgit_enable_log_linecount; 139extern int cgit_enable_log_linecount;
139extern int cgit_max_lock_attempts; 140extern int cgit_max_lock_attempts;
140extern int cgit_cache_root_ttl; 141extern int cgit_cache_root_ttl;
141extern int cgit_cache_repo_ttl; 142extern int cgit_cache_repo_ttl;
142extern int cgit_cache_dynamic_ttl; 143extern int cgit_cache_dynamic_ttl;
143extern int cgit_cache_static_ttl; 144extern int cgit_cache_static_ttl;
144extern int cgit_cache_max_create_time; 145extern int cgit_cache_max_create_time;
145extern int cgit_summary_log; 146extern int cgit_summary_log;
146extern int cgit_summary_tags; 147extern int cgit_summary_tags;
147extern int cgit_summary_branches; 148extern int cgit_summary_branches;
148 149
149extern int cgit_max_msg_len; 150extern int cgit_max_msg_len;
150extern int cgit_max_repodesc_len; 151extern int cgit_max_repodesc_len;
151extern int cgit_max_commit_count; 152extern int cgit_max_commit_count;
152 153
153extern int cgit_query_has_symref; 154extern int cgit_query_has_symref;
154extern int cgit_query_has_sha1; 155extern int cgit_query_has_sha1;
155 156
156extern char *cgit_querystring; 157extern char *cgit_querystring;
157extern char *cgit_query_repo; 158extern char *cgit_query_repo;
158extern char *cgit_query_page; 159extern char *cgit_query_page;
159extern char *cgit_query_search; 160extern char *cgit_query_search;
160extern char *cgit_query_head; 161extern char *cgit_query_head;
161extern char *cgit_query_sha1; 162extern char *cgit_query_sha1;
162extern char *cgit_query_sha2; 163extern char *cgit_query_sha2;
163extern char *cgit_query_path; 164extern char *cgit_query_path;
164extern char *cgit_query_name; 165extern char *cgit_query_name;
165extern int cgit_query_ofs; 166extern int cgit_query_ofs;
166 167
167extern int htmlfd; 168extern int htmlfd;
168 169
169extern int cgit_get_cmd_index(const char *cmd); 170extern int cgit_get_cmd_index(const char *cmd);
170extern struct repoinfo *cgit_get_repoinfo(const char *url); 171extern struct repoinfo *cgit_get_repoinfo(const char *url);
171extern void cgit_global_config_cb(const char *name, const char *value); 172extern void cgit_global_config_cb(const char *name, const char *value);
172extern void cgit_repo_config_cb(const char *name, const char *value); 173extern void cgit_repo_config_cb(const char *name, const char *value);
173extern void cgit_querystring_cb(const char *name, const char *value); 174extern void cgit_querystring_cb(const char *name, const char *value);
174 175
175extern int chk_zero(int result, char *msg); 176extern int chk_zero(int result, char *msg);
176extern int chk_positive(int result, char *msg); 177extern int chk_positive(int result, char *msg);
177extern int chk_non_negative(int result, char *msg); 178extern int chk_non_negative(int result, char *msg);
178 179
179extern int hextoint(char c); 180extern int hextoint(char c);
180extern char *trim_end(const char *str, char c); 181extern char *trim_end(const char *str, char c);
181 182
182extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 183extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
183extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 184extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
184 int flags, void *cb_data); 185 int flags, void *cb_data);
185 186
186extern void *cgit_free_commitinfo(struct commitinfo *info); 187extern void *cgit_free_commitinfo(struct commitinfo *info);
187 188
188extern int cgit_diff_files(const unsigned char *old_sha1, 189extern int cgit_diff_files(const unsigned char *old_sha1,
189 const unsigned char *new_sha1, 190 const unsigned char *new_sha1,
190 linediff_fn fn); 191 linediff_fn fn);
191 192
192extern void cgit_diff_tree(const unsigned char *old_sha1, 193extern void cgit_diff_tree(const unsigned char *old_sha1,
193 const unsigned char *new_sha1, 194 const unsigned char *new_sha1,
194 filepair_fn fn, const char *prefix); 195 filepair_fn fn, const char *prefix);
195 196
196extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 197extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
197 198
198extern char *fmt(const char *format,...); 199extern char *fmt(const char *format,...);
199 200
200extern void html(const char *txt); 201extern void html(const char *txt);
201extern void htmlf(const char *format,...); 202extern void htmlf(const char *format,...);
202extern void html_txt(char *txt); 203extern void html_txt(char *txt);
203extern void html_ntxt(int len, char *txt); 204extern void html_ntxt(int len, char *txt);
204extern void html_attr(char *txt); 205extern void html_attr(char *txt);
205extern void html_hidden(char *name, char *value); 206extern void html_hidden(char *name, char *value);
206extern void html_link_open(char *url, char *title, char *class); 207extern void html_link_open(char *url, char *title, char *class);
207extern void html_link_close(void); 208extern void html_link_close(void);
208extern void html_filemode(unsigned short mode); 209extern void html_filemode(unsigned short mode);
209extern int html_include(const char *filename); 210extern int html_include(const char *filename);
210 211
211extern int cgit_read_config(const char *filename, configfn fn); 212extern int cgit_read_config(const char *filename, configfn fn);
212extern int cgit_parse_query(char *txt, configfn fn); 213extern int cgit_parse_query(char *txt, configfn fn);
213extern struct commitinfo *cgit_parse_commit(struct commit *commit); 214extern struct commitinfo *cgit_parse_commit(struct commit *commit);
214extern struct taginfo *cgit_parse_tag(struct tag *tag); 215extern struct taginfo *cgit_parse_tag(struct tag *tag);
215extern void cgit_parse_url(const char *url); 216extern void cgit_parse_url(const char *url);
216 217
217extern char *cache_safe_filename(const char *unsafe); 218extern char *cache_safe_filename(const char *unsafe);
218extern int cache_lock(struct cacheitem *item); 219extern int cache_lock(struct cacheitem *item);
219extern int cache_unlock(struct cacheitem *item); 220extern int cache_unlock(struct cacheitem *item);
220extern int cache_cancel_lock(struct cacheitem *item); 221extern int cache_cancel_lock(struct cacheitem *item);
221extern int cache_exist(struct cacheitem *item); 222extern int cache_exist(struct cacheitem *item);
222extern int cache_expired(struct cacheitem *item); 223extern int cache_expired(struct cacheitem *item);
223 224
224extern char *cgit_repourl(const char *reponame); 225extern char *cgit_repourl(const char *reponame);
225extern char *cgit_fileurl(const char *reponame, const char *pagename, 226extern char *cgit_fileurl(const char *reponame, const char *pagename,
226 const char *filename, const char *query); 227 const char *filename, const char *query);
227extern char *cgit_pageurl(const char *reponame, const char *pagename, 228extern char *cgit_pageurl(const char *reponame, const char *pagename,
228 const char *query); 229 const char *query);
229 230
230extern const char *cgit_repobasename(const char *reponame); 231extern const char *cgit_repobasename(const char *reponame);
231 232
232extern void cgit_tree_link(char *name, char *title, char *class, char *head, 233extern void cgit_tree_link(char *name, char *title, char *class, char *head,
233 char *rev, char *path); 234 char *rev, char *path);
234extern void cgit_log_link(char *name, char *title, char *class, char *head, 235extern void cgit_log_link(char *name, char *title, char *class, char *head,
235 char *rev, char *path, int ofs); 236 char *rev, char *path, int ofs);
236extern void cgit_commit_link(char *name, char *title, char *class, char *head, 237extern void cgit_commit_link(char *name, char *title, char *class, char *head,
237 char *rev); 238 char *rev);
238extern void cgit_snapshot_link(char *name, char *title, char *class, 239extern void cgit_snapshot_link(char *name, char *title, char *class,
239 char *head, char *rev, char *archivename); 240 char *head, char *rev, char *archivename);
240extern void cgit_diff_link(char *name, char *title, char *class, char *head, 241extern void cgit_diff_link(char *name, char *title, char *class, char *head,
241 char *new_rev, char *old_rev, char *path); 242 char *new_rev, char *old_rev, char *path);
242 243
243extern void cgit_object_link(struct object *obj); 244extern void cgit_object_link(struct object *obj);
244 245
245extern void cgit_print_error(char *msg); 246extern void cgit_print_error(char *msg);
246extern void cgit_print_date(time_t secs, char *format); 247extern void cgit_print_date(time_t secs, char *format);
247extern void cgit_print_age(time_t t, time_t max_relative, char *format); 248extern void cgit_print_age(time_t t, time_t max_relative, char *format);
248extern void cgit_print_docstart(char *title, struct cacheitem *item); 249extern void cgit_print_docstart(char *title, struct cacheitem *item);
249extern void cgit_print_docend(); 250extern void cgit_print_docend();
250extern void cgit_print_pageheader(char *title, int show_search); 251extern void cgit_print_pageheader(char *title, int show_search);
251extern void cgit_print_snapshot_start(const char *mimetype, 252extern void cgit_print_snapshot_start(const char *mimetype,
252 const char *filename, 253 const char *filename,
253 struct cacheitem *item); 254 struct cacheitem *item);
254extern void cgit_print_branches(int maxcount); 255extern void cgit_print_branches(int maxcount);
255extern void cgit_print_tags(int maxcount); 256extern void cgit_print_tags(int maxcount);
256 257
257extern void cgit_print_repolist(struct cacheitem *item); 258extern void cgit_print_repolist(struct cacheitem *item);
258extern void cgit_print_summary(); 259extern void cgit_print_summary();
259extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); 260extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
260extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 261extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
261extern void cgit_print_tree(const char *rev, char *path); 262extern void cgit_print_tree(const char *rev, char *path);
262extern void cgit_print_commit(char *hex); 263extern void cgit_print_commit(char *hex);
264extern void cgit_print_refs();
263extern void cgit_print_tag(char *revname); 265extern void cgit_print_tag(char *revname);
264extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); 266extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
265extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 267extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
266 const char *hex, const char *prefix, 268 const char *hex, const char *prefix,
267 const char *filename, int snapshot); 269 const char *filename, int snapshot);
268extern void cgit_print_snapshot_links(const char *repo, const char *head, 270extern void cgit_print_snapshot_links(const char *repo, const char *head,
269 const char *hex, int snapshots); 271 const char *hex, int snapshots);
270extern int cgit_parse_snapshots_mask(const char *str); 272extern int cgit_parse_snapshots_mask(const char *str);
271 273
272#endif /* CGIT_H */ 274#endif /* CGIT_H */
diff --git a/shared.c b/shared.c
index ff600db..7eb2b0e 100644
--- a/shared.c
+++ b/shared.c
@@ -1,453 +1,453 @@
1/* shared.c: global vars + some callback functions 1/* shared.c: global vars + some callback functions
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13int cgit_cmd; 13int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
16 16
17char *cgit_root_title = "Git repository browser"; 17char *cgit_root_title = "Git repository browser";
18char *cgit_css = "/cgit.css"; 18char *cgit_css = "/cgit.css";
19char *cgit_logo = "/git-logo.png"; 19char *cgit_logo = "/git-logo.png";
20char *cgit_index_header = NULL; 20char *cgit_index_header = NULL;
21char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 21char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
22char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 22char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
23char *cgit_agefile = "info/web/last-modified"; 23char *cgit_agefile = "info/web/last-modified";
24char *cgit_virtual_root = NULL; 24char *cgit_virtual_root = NULL;
25char *cgit_script_name = CGIT_SCRIPT_NAME; 25char *cgit_script_name = CGIT_SCRIPT_NAME;
26char *cgit_cache_root = CGIT_CACHE_ROOT; 26char *cgit_cache_root = CGIT_CACHE_ROOT;
27char *cgit_repo_group = NULL; 27char *cgit_repo_group = NULL;
28 28
29int cgit_nocache = 0; 29int cgit_nocache = 0;
30int cgit_snapshots = 0; 30int cgit_snapshots = 0;
31int cgit_enable_index_links = 0; 31int cgit_enable_index_links = 0;
32int cgit_enable_log_filecount = 0; 32int cgit_enable_log_filecount = 0;
33int cgit_enable_log_linecount = 0; 33int cgit_enable_log_linecount = 0;
34int cgit_max_lock_attempts = 5; 34int cgit_max_lock_attempts = 5;
35int cgit_cache_root_ttl = 5; 35int cgit_cache_root_ttl = 5;
36int cgit_cache_repo_ttl = 5; 36int cgit_cache_repo_ttl = 5;
37int cgit_cache_dynamic_ttl = 5; 37int cgit_cache_dynamic_ttl = 5;
38int cgit_cache_static_ttl = -1; 38int cgit_cache_static_ttl = -1;
39int cgit_cache_max_create_time = 5; 39int cgit_cache_max_create_time = 5;
40int cgit_summary_log = 0; 40int cgit_summary_log = 0;
41int cgit_summary_tags = 0; 41int cgit_summary_tags = 0;
42int cgit_summary_branches = 0; 42int cgit_summary_branches = 0;
43int cgit_renamelimit = -1; 43int cgit_renamelimit = -1;
44 44
45int cgit_max_msg_len = 60; 45int cgit_max_msg_len = 60;
46int cgit_max_repodesc_len = 60; 46int cgit_max_repodesc_len = 60;
47int cgit_max_commit_count = 50; 47int cgit_max_commit_count = 50;
48 48
49int cgit_query_has_symref = 0; 49int cgit_query_has_symref = 0;
50int cgit_query_has_sha1 = 0; 50int cgit_query_has_sha1 = 0;
51 51
52char *cgit_querystring = NULL; 52char *cgit_querystring = NULL;
53char *cgit_query_repo = NULL; 53char *cgit_query_repo = NULL;
54char *cgit_query_page = NULL; 54char *cgit_query_page = NULL;
55char *cgit_query_head = NULL; 55char *cgit_query_head = NULL;
56char *cgit_query_search = NULL; 56char *cgit_query_search = NULL;
57char *cgit_query_sha1 = NULL; 57char *cgit_query_sha1 = NULL;
58char *cgit_query_sha2 = NULL; 58char *cgit_query_sha2 = NULL;
59char *cgit_query_path = NULL; 59char *cgit_query_path = NULL;
60char *cgit_query_name = NULL; 60char *cgit_query_name = NULL;
61int cgit_query_ofs = 0; 61int cgit_query_ofs = 0;
62 62
63int htmlfd = 0; 63int htmlfd = 0;
64 64
65 65
66int cgit_get_cmd_index(const char *cmd) 66int cgit_get_cmd_index(const char *cmd)
67{ 67{
68 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 68 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
69 "snapshot", "tag", NULL}; 69 "snapshot", "tag", "refs", NULL};
70 int i; 70 int i;
71 71
72 for(i = 0; cmds[i]; i++) 72 for(i = 0; cmds[i]; i++)
73 if (!strcmp(cmd, cmds[i])) 73 if (!strcmp(cmd, cmds[i]))
74 return i + 1; 74 return i + 1;
75 return 0; 75 return 0;
76} 76}
77 77
78int chk_zero(int result, char *msg) 78int chk_zero(int result, char *msg)
79{ 79{
80 if (result != 0) 80 if (result != 0)
81 die("%s: %s", msg, strerror(errno)); 81 die("%s: %s", msg, strerror(errno));
82 return result; 82 return result;
83} 83}
84 84
85int chk_positive(int result, char *msg) 85int chk_positive(int result, char *msg)
86{ 86{
87 if (result <= 0) 87 if (result <= 0)
88 die("%s: %s", msg, strerror(errno)); 88 die("%s: %s", msg, strerror(errno));
89 return result; 89 return result;
90} 90}
91 91
92int chk_non_negative(int result, char *msg) 92int chk_non_negative(int result, char *msg)
93{ 93{
94 if (result < 0) 94 if (result < 0)
95 die("%s: %s",msg, strerror(errno)); 95 die("%s: %s",msg, strerror(errno));
96 return result; 96 return result;
97} 97}
98 98
99struct repoinfo *add_repo(const char *url) 99struct repoinfo *add_repo(const char *url)
100{ 100{
101 struct repoinfo *ret; 101 struct repoinfo *ret;
102 102
103 if (++cgit_repolist.count > cgit_repolist.length) { 103 if (++cgit_repolist.count > cgit_repolist.length) {
104 if (cgit_repolist.length == 0) 104 if (cgit_repolist.length == 0)
105 cgit_repolist.length = 8; 105 cgit_repolist.length = 8;
106 else 106 else
107 cgit_repolist.length *= 2; 107 cgit_repolist.length *= 2;
108 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 108 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
109 cgit_repolist.length * 109 cgit_repolist.length *
110 sizeof(struct repoinfo)); 110 sizeof(struct repoinfo));
111 } 111 }
112 112
113 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 113 ret = &cgit_repolist.repos[cgit_repolist.count-1];
114 ret->url = trim_end(url, '/'); 114 ret->url = trim_end(url, '/');
115 ret->name = ret->url; 115 ret->name = ret->url;
116 ret->path = NULL; 116 ret->path = NULL;
117 ret->desc = NULL; 117 ret->desc = NULL;
118 ret->owner = NULL; 118 ret->owner = NULL;
119 ret->group = cgit_repo_group; 119 ret->group = cgit_repo_group;
120 ret->defbranch = "master"; 120 ret->defbranch = "master";
121 ret->snapshots = cgit_snapshots; 121 ret->snapshots = cgit_snapshots;
122 ret->enable_log_filecount = cgit_enable_log_filecount; 122 ret->enable_log_filecount = cgit_enable_log_filecount;
123 ret->enable_log_linecount = cgit_enable_log_linecount; 123 ret->enable_log_linecount = cgit_enable_log_linecount;
124 ret->module_link = cgit_module_link; 124 ret->module_link = cgit_module_link;
125 ret->readme = NULL; 125 ret->readme = NULL;
126 return ret; 126 return ret;
127} 127}
128 128
129struct repoinfo *cgit_get_repoinfo(const char *url) 129struct repoinfo *cgit_get_repoinfo(const char *url)
130{ 130{
131 int i; 131 int i;
132 struct repoinfo *repo; 132 struct repoinfo *repo;
133 133
134 for (i=0; i<cgit_repolist.count; i++) { 134 for (i=0; i<cgit_repolist.count; i++) {
135 repo = &cgit_repolist.repos[i]; 135 repo = &cgit_repolist.repos[i];
136 if (!strcmp(repo->url, url)) 136 if (!strcmp(repo->url, url))
137 return repo; 137 return repo;
138 } 138 }
139 return NULL; 139 return NULL;
140} 140}
141 141
142void cgit_global_config_cb(const char *name, const char *value) 142void cgit_global_config_cb(const char *name, const char *value)
143{ 143{
144 if (!strcmp(name, "root-title")) 144 if (!strcmp(name, "root-title"))
145 cgit_root_title = xstrdup(value); 145 cgit_root_title = xstrdup(value);
146 else if (!strcmp(name, "css")) 146 else if (!strcmp(name, "css"))
147 cgit_css = xstrdup(value); 147 cgit_css = xstrdup(value);
148 else if (!strcmp(name, "logo")) 148 else if (!strcmp(name, "logo"))
149 cgit_logo = xstrdup(value); 149 cgit_logo = xstrdup(value);
150 else if (!strcmp(name, "index-header")) 150 else if (!strcmp(name, "index-header"))
151 cgit_index_header = xstrdup(value); 151 cgit_index_header = xstrdup(value);
152 else if (!strcmp(name, "logo-link")) 152 else if (!strcmp(name, "logo-link"))
153 cgit_logo_link = xstrdup(value); 153 cgit_logo_link = xstrdup(value);
154 else if (!strcmp(name, "module-link")) 154 else if (!strcmp(name, "module-link"))
155 cgit_module_link = xstrdup(value); 155 cgit_module_link = xstrdup(value);
156 else if (!strcmp(name, "virtual-root")) 156 else if (!strcmp(name, "virtual-root"))
157 cgit_virtual_root = trim_end(value, '/'); 157 cgit_virtual_root = trim_end(value, '/');
158 else if (!strcmp(name, "nocache")) 158 else if (!strcmp(name, "nocache"))
159 cgit_nocache = atoi(value); 159 cgit_nocache = atoi(value);
160 else if (!strcmp(name, "snapshots")) 160 else if (!strcmp(name, "snapshots"))
161 cgit_snapshots = cgit_parse_snapshots_mask(value); 161 cgit_snapshots = cgit_parse_snapshots_mask(value);
162 else if (!strcmp(name, "enable-index-links")) 162 else if (!strcmp(name, "enable-index-links"))
163 cgit_enable_index_links = atoi(value); 163 cgit_enable_index_links = atoi(value);
164 else if (!strcmp(name, "enable-log-filecount")) 164 else if (!strcmp(name, "enable-log-filecount"))
165 cgit_enable_log_filecount = atoi(value); 165 cgit_enable_log_filecount = atoi(value);
166 else if (!strcmp(name, "enable-log-linecount")) 166 else if (!strcmp(name, "enable-log-linecount"))
167 cgit_enable_log_linecount = atoi(value); 167 cgit_enable_log_linecount = atoi(value);
168 else if (!strcmp(name, "cache-root")) 168 else if (!strcmp(name, "cache-root"))
169 cgit_cache_root = xstrdup(value); 169 cgit_cache_root = xstrdup(value);
170 else if (!strcmp(name, "cache-root-ttl")) 170 else if (!strcmp(name, "cache-root-ttl"))
171 cgit_cache_root_ttl = atoi(value); 171 cgit_cache_root_ttl = atoi(value);
172 else if (!strcmp(name, "cache-repo-ttl")) 172 else if (!strcmp(name, "cache-repo-ttl"))
173 cgit_cache_repo_ttl = atoi(value); 173 cgit_cache_repo_ttl = atoi(value);
174 else if (!strcmp(name, "cache-static-ttl")) 174 else if (!strcmp(name, "cache-static-ttl"))
175 cgit_cache_static_ttl = atoi(value); 175 cgit_cache_static_ttl = atoi(value);
176 else if (!strcmp(name, "cache-dynamic-ttl")) 176 else if (!strcmp(name, "cache-dynamic-ttl"))
177 cgit_cache_dynamic_ttl = atoi(value); 177 cgit_cache_dynamic_ttl = atoi(value);
178 else if (!strcmp(name, "max-message-length")) 178 else if (!strcmp(name, "max-message-length"))
179 cgit_max_msg_len = atoi(value); 179 cgit_max_msg_len = atoi(value);
180 else if (!strcmp(name, "max-repodesc-length")) 180 else if (!strcmp(name, "max-repodesc-length"))
181 cgit_max_repodesc_len = atoi(value); 181 cgit_max_repodesc_len = atoi(value);
182 else if (!strcmp(name, "max-commit-count")) 182 else if (!strcmp(name, "max-commit-count"))
183 cgit_max_commit_count = atoi(value); 183 cgit_max_commit_count = atoi(value);
184 else if (!strcmp(name, "summary-log")) 184 else if (!strcmp(name, "summary-log"))
185 cgit_summary_log = atoi(value); 185 cgit_summary_log = atoi(value);
186 else if (!strcmp(name, "summary-branches")) 186 else if (!strcmp(name, "summary-branches"))
187 cgit_summary_branches = atoi(value); 187 cgit_summary_branches = atoi(value);
188 else if (!strcmp(name, "summary-tags")) 188 else if (!strcmp(name, "summary-tags"))
189 cgit_summary_tags = atoi(value); 189 cgit_summary_tags = atoi(value);
190 else if (!strcmp(name, "agefile")) 190 else if (!strcmp(name, "agefile"))
191 cgit_agefile = xstrdup(value); 191 cgit_agefile = xstrdup(value);
192 else if (!strcmp(name, "renamelimit")) 192 else if (!strcmp(name, "renamelimit"))
193 cgit_renamelimit = atoi(value); 193 cgit_renamelimit = atoi(value);
194 else if (!strcmp(name, "repo.group")) 194 else if (!strcmp(name, "repo.group"))
195 cgit_repo_group = xstrdup(value); 195 cgit_repo_group = xstrdup(value);
196 else if (!strcmp(name, "repo.url")) 196 else if (!strcmp(name, "repo.url"))
197 cgit_repo = add_repo(value); 197 cgit_repo = add_repo(value);
198 else if (!strcmp(name, "repo.name")) 198 else if (!strcmp(name, "repo.name"))
199 cgit_repo->name = xstrdup(value); 199 cgit_repo->name = xstrdup(value);
200 else if (cgit_repo && !strcmp(name, "repo.path")) 200 else if (cgit_repo && !strcmp(name, "repo.path"))
201 cgit_repo->path = trim_end(value, '/'); 201 cgit_repo->path = trim_end(value, '/');
202 else if (cgit_repo && !strcmp(name, "repo.desc")) 202 else if (cgit_repo && !strcmp(name, "repo.desc"))
203 cgit_repo->desc = xstrdup(value); 203 cgit_repo->desc = xstrdup(value);
204 else if (cgit_repo && !strcmp(name, "repo.owner")) 204 else if (cgit_repo && !strcmp(name, "repo.owner"))
205 cgit_repo->owner = xstrdup(value); 205 cgit_repo->owner = xstrdup(value);
206 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 206 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
207 cgit_repo->defbranch = xstrdup(value); 207 cgit_repo->defbranch = xstrdup(value);
208 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 208 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
209 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 209 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
210 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 210 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
211 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 211 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
212 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 212 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
213 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 213 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
214 else if (cgit_repo && !strcmp(name, "repo.module-link")) 214 else if (cgit_repo && !strcmp(name, "repo.module-link"))
215 cgit_repo->module_link= xstrdup(value); 215 cgit_repo->module_link= xstrdup(value);
216 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { 216 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
217 if (*value == '/') 217 if (*value == '/')
218 cgit_repo->readme = xstrdup(value); 218 cgit_repo->readme = xstrdup(value);
219 else 219 else
220 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); 220 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
221 } else if (!strcmp(name, "include")) 221 } else if (!strcmp(name, "include"))
222 cgit_read_config(value, cgit_global_config_cb); 222 cgit_read_config(value, cgit_global_config_cb);
223} 223}
224 224
225void cgit_querystring_cb(const char *name, const char *value) 225void cgit_querystring_cb(const char *name, const char *value)
226{ 226{
227 if (!strcmp(name,"r")) { 227 if (!strcmp(name,"r")) {
228 cgit_query_repo = xstrdup(value); 228 cgit_query_repo = xstrdup(value);
229 cgit_repo = cgit_get_repoinfo(value); 229 cgit_repo = cgit_get_repoinfo(value);
230 } else if (!strcmp(name, "p")) { 230 } else if (!strcmp(name, "p")) {
231 cgit_query_page = xstrdup(value); 231 cgit_query_page = xstrdup(value);
232 cgit_cmd = cgit_get_cmd_index(value); 232 cgit_cmd = cgit_get_cmd_index(value);
233 } else if (!strcmp(name, "url")) { 233 } else if (!strcmp(name, "url")) {
234 cgit_parse_url(value); 234 cgit_parse_url(value);
235 } else if (!strcmp(name, "q")) { 235 } else if (!strcmp(name, "q")) {
236 cgit_query_search = xstrdup(value); 236 cgit_query_search = xstrdup(value);
237 } else if (!strcmp(name, "h")) { 237 } else if (!strcmp(name, "h")) {
238 cgit_query_head = xstrdup(value); 238 cgit_query_head = xstrdup(value);
239 cgit_query_has_symref = 1; 239 cgit_query_has_symref = 1;
240 } else if (!strcmp(name, "id")) { 240 } else if (!strcmp(name, "id")) {
241 cgit_query_sha1 = xstrdup(value); 241 cgit_query_sha1 = xstrdup(value);
242 cgit_query_has_sha1 = 1; 242 cgit_query_has_sha1 = 1;
243 } else if (!strcmp(name, "id2")) { 243 } else if (!strcmp(name, "id2")) {
244 cgit_query_sha2 = xstrdup(value); 244 cgit_query_sha2 = xstrdup(value);
245 cgit_query_has_sha1 = 1; 245 cgit_query_has_sha1 = 1;
246 } else if (!strcmp(name, "ofs")) { 246 } else if (!strcmp(name, "ofs")) {
247 cgit_query_ofs = atoi(value); 247 cgit_query_ofs = atoi(value);
248 } else if (!strcmp(name, "path")) { 248 } else if (!strcmp(name, "path")) {
249 cgit_query_path = trim_end(value, '/'); 249 cgit_query_path = trim_end(value, '/');
250 } else if (!strcmp(name, "name")) { 250 } else if (!strcmp(name, "name")) {
251 cgit_query_name = xstrdup(value); 251 cgit_query_name = xstrdup(value);
252 } 252 }
253} 253}
254 254
255void *cgit_free_commitinfo(struct commitinfo *info) 255void *cgit_free_commitinfo(struct commitinfo *info)
256{ 256{
257 free(info->author); 257 free(info->author);
258 free(info->author_email); 258 free(info->author_email);
259 free(info->committer); 259 free(info->committer);
260 free(info->committer_email); 260 free(info->committer_email);
261 free(info->subject); 261 free(info->subject);
262 free(info); 262 free(info);
263 return NULL; 263 return NULL;
264} 264}
265 265
266int hextoint(char c) 266int hextoint(char c)
267{ 267{
268 if (c >= 'a' && c <= 'f') 268 if (c >= 'a' && c <= 'f')
269 return 10 + c - 'a'; 269 return 10 + c - 'a';
270 else if (c >= 'A' && c <= 'F') 270 else if (c >= 'A' && c <= 'F')
271 return 10 + c - 'A'; 271 return 10 + c - 'A';
272 else if (c >= '0' && c <= '9') 272 else if (c >= '0' && c <= '9')
273 return c - '0'; 273 return c - '0';
274 else 274 else
275 return -1; 275 return -1;
276} 276}
277 277
278char *trim_end(const char *str, char c) 278char *trim_end(const char *str, char c)
279{ 279{
280 int len; 280 int len;
281 char *s, *t; 281 char *s, *t;
282 282
283 if (str == NULL) 283 if (str == NULL)
284 return NULL; 284 return NULL;
285 t = (char *)str; 285 t = (char *)str;
286 len = strlen(t); 286 len = strlen(t);
287 while(len > 0 && t[len - 1] == c) 287 while(len > 0 && t[len - 1] == c)
288 len--; 288 len--;
289 289
290 if (len == 0) 290 if (len == 0)
291 return NULL; 291 return NULL;
292 292
293 c = t[len]; 293 c = t[len];
294 t[len] = '\0'; 294 t[len] = '\0';
295 s = xstrdup(t); 295 s = xstrdup(t);
296 t[len] = c; 296 t[len] = c;
297 return s; 297 return s;
298} 298}
299 299
300void cgit_add_ref(struct reflist *list, struct refinfo *ref) 300void cgit_add_ref(struct reflist *list, struct refinfo *ref)
301{ 301{
302 size_t size; 302 size_t size;
303 303
304 if (list->count >= list->alloc) { 304 if (list->count >= list->alloc) {
305 list->alloc += (list->alloc ? list->alloc : 4); 305 list->alloc += (list->alloc ? list->alloc : 4);
306 size = list->alloc * sizeof(struct refinfo *); 306 size = list->alloc * sizeof(struct refinfo *);
307 list->refs = xrealloc(list->refs, size); 307 list->refs = xrealloc(list->refs, size);
308 } 308 }
309 list->refs[list->count++] = ref; 309 list->refs[list->count++] = ref;
310} 310}
311 311
312struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) 312struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
313{ 313{
314 struct refinfo *ref; 314 struct refinfo *ref;
315 315
316 ref = xmalloc(sizeof (struct refinfo)); 316 ref = xmalloc(sizeof (struct refinfo));
317 ref->refname = xstrdup(refname); 317 ref->refname = xstrdup(refname);
318 ref->object = parse_object(sha1); 318 ref->object = parse_object(sha1);
319 switch (ref->object->type) { 319 switch (ref->object->type) {
320 case OBJ_TAG: 320 case OBJ_TAG:
321 ref->tag = cgit_parse_tag((struct tag *)ref->object); 321 ref->tag = cgit_parse_tag((struct tag *)ref->object);
322 break; 322 break;
323 case OBJ_COMMIT: 323 case OBJ_COMMIT:
324 ref->commit = cgit_parse_commit((struct commit *)ref->object); 324 ref->commit = cgit_parse_commit((struct commit *)ref->object);
325 break; 325 break;
326 } 326 }
327 return ref; 327 return ref;
328} 328}
329 329
330int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, 330int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
331 void *cb_data) 331 void *cb_data)
332{ 332{
333 struct reflist *list = (struct reflist *)cb_data; 333 struct reflist *list = (struct reflist *)cb_data;
334 struct refinfo *info = cgit_mk_refinfo(refname, sha1); 334 struct refinfo *info = cgit_mk_refinfo(refname, sha1);
335 335
336 if (info) 336 if (info)
337 cgit_add_ref(list, info); 337 cgit_add_ref(list, info);
338 return 0; 338 return 0;
339} 339}
340 340
341void cgit_diff_tree_cb(struct diff_queue_struct *q, 341void cgit_diff_tree_cb(struct diff_queue_struct *q,
342 struct diff_options *options, void *data) 342 struct diff_options *options, void *data)
343{ 343{
344 int i; 344 int i;
345 345
346 for (i = 0; i < q->nr; i++) { 346 for (i = 0; i < q->nr; i++) {
347 if (q->queue[i]->status == 'U') 347 if (q->queue[i]->status == 'U')
348 continue; 348 continue;
349 ((filepair_fn)data)(q->queue[i]); 349 ((filepair_fn)data)(q->queue[i]);
350 } 350 }
351} 351}
352 352
353static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 353static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
354{ 354{
355 enum object_type type; 355 enum object_type type;
356 356
357 if (is_null_sha1(sha1)) { 357 if (is_null_sha1(sha1)) {
358 file->ptr = (char *)""; 358 file->ptr = (char *)"";
359 file->size = 0; 359 file->size = 0;
360 } else { 360 } else {
361 file->ptr = read_sha1_file(sha1, &type, 361 file->ptr = read_sha1_file(sha1, &type,
362 (unsigned long *)&file->size); 362 (unsigned long *)&file->size);
363 } 363 }
364 return 1; 364 return 1;
365} 365}
366 366
367/* 367/*
368 * Receive diff-buffers from xdiff and concatenate them as 368 * Receive diff-buffers from xdiff and concatenate them as
369 * needed across multiple callbacks. 369 * needed across multiple callbacks.
370 * 370 *
371 * This is basically a copy of xdiff-interface.c/xdiff_outf(), 371 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
372 * ripped from git and modified to use globals instead of 372 * ripped from git and modified to use globals instead of
373 * a special callback-struct. 373 * a special callback-struct.
374 */ 374 */
375char *diffbuf = NULL; 375char *diffbuf = NULL;
376int buflen = 0; 376int buflen = 0;
377 377
378int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 378int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
379{ 379{
380 int i; 380 int i;
381 381
382 for (i = 0; i < nbuf; i++) { 382 for (i = 0; i < nbuf; i++) {
383 if (mb[i].ptr[mb[i].size-1] != '\n') { 383 if (mb[i].ptr[mb[i].size-1] != '\n') {
384 /* Incomplete line */ 384 /* Incomplete line */
385 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 385 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
386 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 386 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
387 buflen += mb[i].size; 387 buflen += mb[i].size;
388 continue; 388 continue;
389 } 389 }
390 390
391 /* we have a complete line */ 391 /* we have a complete line */
392 if (!diffbuf) { 392 if (!diffbuf) {
393 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 393 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
394 continue; 394 continue;
395 } 395 }
396 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 396 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
397 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 397 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
398 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 398 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
399 free(diffbuf); 399 free(diffbuf);
400 diffbuf = NULL; 400 diffbuf = NULL;
401 buflen = 0; 401 buflen = 0;
402 } 402 }
403 if (diffbuf) { 403 if (diffbuf) {
404 ((linediff_fn)priv)(diffbuf, buflen); 404 ((linediff_fn)priv)(diffbuf, buflen);
405 free(diffbuf); 405 free(diffbuf);
406 diffbuf = NULL; 406 diffbuf = NULL;
407 buflen = 0; 407 buflen = 0;
408 } 408 }
409 return 0; 409 return 0;
410} 410}
411 411
412int cgit_diff_files(const unsigned char *old_sha1, 412int cgit_diff_files(const unsigned char *old_sha1,
413 const unsigned char *new_sha1, 413 const unsigned char *new_sha1,
414 linediff_fn fn) 414 linediff_fn fn)
415{ 415{
416 mmfile_t file1, file2; 416 mmfile_t file1, file2;
417 xpparam_t diff_params; 417 xpparam_t diff_params;
418 xdemitconf_t emit_params; 418 xdemitconf_t emit_params;
419 xdemitcb_t emit_cb; 419 xdemitcb_t emit_cb;
420 420
421 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 421 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
422 return 1; 422 return 1;
423 423
424 diff_params.flags = XDF_NEED_MINIMAL; 424 diff_params.flags = XDF_NEED_MINIMAL;
425 emit_params.ctxlen = 3; 425 emit_params.ctxlen = 3;
426 emit_params.flags = XDL_EMIT_FUNCNAMES; 426 emit_params.flags = XDL_EMIT_FUNCNAMES;
427 emit_params.find_func = NULL; 427 emit_params.find_func = NULL;
428 emit_cb.outf = filediff_cb; 428 emit_cb.outf = filediff_cb;
429 emit_cb.priv = fn; 429 emit_cb.priv = fn;
430 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 430 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
431 return 0; 431 return 0;
432} 432}
433 433
434void cgit_diff_tree(const unsigned char *old_sha1, 434void cgit_diff_tree(const unsigned char *old_sha1,
435 const unsigned char *new_sha1, 435 const unsigned char *new_sha1,
436 filepair_fn fn, const char *prefix) 436 filepair_fn fn, const char *prefix)
437{ 437{
438 struct diff_options opt; 438 struct diff_options opt;
439 int ret; 439 int ret;
440 int prefixlen; 440 int prefixlen;
441 441
442 diff_setup(&opt); 442 diff_setup(&opt);
443 opt.output_format = DIFF_FORMAT_CALLBACK; 443 opt.output_format = DIFF_FORMAT_CALLBACK;
444 opt.detect_rename = 1; 444 opt.detect_rename = 1;
445 opt.rename_limit = cgit_renamelimit; 445 opt.rename_limit = cgit_renamelimit;
446 opt.recursive = 1; 446 opt.recursive = 1;
447 opt.format_callback = cgit_diff_tree_cb; 447 opt.format_callback = cgit_diff_tree_cb;
448 opt.format_callback_data = fn; 448 opt.format_callback_data = fn;
449 if (prefix) { 449 if (prefix) {
450 opt.nr_paths = 1; 450 opt.nr_paths = 1;
451 opt.paths = &prefix; 451 opt.paths = &prefix;
452 prefixlen = strlen(prefix); 452 prefixlen = strlen(prefix);
453 opt.pathlens = &prefixlen; 453 opt.pathlens = &prefixlen;
diff --git a/ui-refs.c b/ui-refs.c
new file mode 100644
index 0000000..295f5ba
--- a/dev/null
+++ b/ui-refs.c
@@ -0,0 +1,30 @@
1/* ui-refs.c: browse symbolic refs
2 *
3 * Copyright (C) 2006 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
11
12
13
14void cgit_print_refs()
15{
16
17 html("<table class='list nowrap'>");
18
19 if (cgit_query_path && !strncmp(cgit_query_path, "heads", 5))
20 cgit_print_branches(0);
21 else if (cgit_query_path && !strncmp(cgit_query_path, "tags", 4))
22 cgit_print_tags(0);
23 else {
24 cgit_print_branches(0);
25 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
26 cgit_print_tags(0);
27 }
28
29 html("</table>");
30}