summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-06 10:33:05 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-06 10:33:05 (UTC)
commit3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (patch) (unidiff)
tree93198341d83438fce50ffeda19b2510138b7b2e5
parent7b5cee65fd9cf31e4f19ce4ff613778cb95512a9 (diff)
parentd2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (diff)
downloadcgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.zip
cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.gz
cgit-3157ea3b7e5204dba2892ffb54d641746c4c7ca4.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile23
-rw-r--r--cgit.h6
-rw-r--r--parsing.c4
-rw-r--r--ui-log.c17
-rw-r--r--ui-repolist.c4
5 files changed, 46 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 2107610..2e51c31 100644
--- a/Makefile
+++ b/Makefile
@@ -1,129 +1,152 @@
1CGIT_VERSION = v0.8.1 1CGIT_VERSION = v0.8.1
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.6.0.3 7GIT_VER = 1.6.0.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# Define NO_STRCASESTR if you don't have strcasestr.
11#
12# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
13#
14
15#-include config.mak
16
17#
18# Platform specific tweaks
19#
20
21uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
22uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
23uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
24
25ifeq ($(uname_O),Cygwin)
26 NO_STRCASESTR = YesPlease
27 NEEDS_LIBICONV = YesPlease
28endif
29
10# 30#
11# Let the user override the above settings. 31# Let the user override the above settings.
12# 32#
13-include cgit.conf 33-include cgit.conf
14 34
15# 35#
16# Define a way to invoke make in subdirs quietly, shamelessly ripped 36# Define a way to invoke make in subdirs quietly, shamelessly ripped
17# from git.git 37# from git.git
18# 38#
19QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir 39QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
20QUIET_SUBDIR1 = 40QUIET_SUBDIR1 =
21 41
22ifneq ($(findstring $(MAKEFLAGS),w),w) 42ifneq ($(findstring $(MAKEFLAGS),w),w)
23PRINT_DIR = --no-print-directory 43PRINT_DIR = --no-print-directory
24else # "make -w" 44else # "make -w"
25NO_SUBDIR = : 45NO_SUBDIR = :
26endif 46endif
27 47
28ifndef V 48ifndef V
29 QUIET_CC = @echo ' ' CC $@; 49 QUIET_CC = @echo ' ' CC $@;
30 QUIET_MM = @echo ' ' MM $@; 50 QUIET_MM = @echo ' ' MM $@;
31 QUIET_SUBDIR0 = +@subdir= 51 QUIET_SUBDIR0 = +@subdir=
32 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ 52 QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
33 $(MAKE) $(PRINT_DIR) -C $$subdir 53 $(MAKE) $(PRINT_DIR) -C $$subdir
34endif 54endif
35 55
36# 56#
37# Define a pattern rule for automatic dependency building 57# Define a pattern rule for automatic dependency building
38# 58#
39%.d: %.c 59%.d: %.c
40 $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ 60 $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
41 61
42# 62#
43# Define a pattern rule for silent object building 63# Define a pattern rule for silent object building
44# 64#
45%.o: %.c 65%.o: %.c
46 $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< 66 $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
47 67
48 68
49EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 69EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
50OBJECTS = 70OBJECTS =
51OBJECTS += cache.o 71OBJECTS += cache.o
52OBJECTS += cgit.o 72OBJECTS += cgit.o
53OBJECTS += cmd.o 73OBJECTS += cmd.o
54OBJECTS += configfile.o 74OBJECTS += configfile.o
55OBJECTS += html.o 75OBJECTS += html.o
56OBJECTS += parsing.o 76OBJECTS += parsing.o
57OBJECTS += scan-tree.o 77OBJECTS += scan-tree.o
58OBJECTS += shared.o 78OBJECTS += shared.o
59OBJECTS += ui-atom.o 79OBJECTS += ui-atom.o
60OBJECTS += ui-blob.o 80OBJECTS += ui-blob.o
61OBJECTS += ui-clone.o 81OBJECTS += ui-clone.o
62OBJECTS += ui-commit.o 82OBJECTS += ui-commit.o
63OBJECTS += ui-diff.o 83OBJECTS += ui-diff.o
64OBJECTS += ui-log.o 84OBJECTS += ui-log.o
65OBJECTS += ui-patch.o 85OBJECTS += ui-patch.o
66OBJECTS += ui-plain.o 86OBJECTS += ui-plain.o
67OBJECTS += ui-refs.o 87OBJECTS += ui-refs.o
68OBJECTS += ui-repolist.o 88OBJECTS += ui-repolist.o
69OBJECTS += ui-shared.o 89OBJECTS += ui-shared.o
70OBJECTS += ui-snapshot.o 90OBJECTS += ui-snapshot.o
71OBJECTS += ui-summary.o 91OBJECTS += ui-summary.o
72OBJECTS += ui-tag.o 92OBJECTS += ui-tag.o
73OBJECTS += ui-tree.o 93OBJECTS += ui-tree.o
74 94
75ifdef NEEDS_LIBICONV 95ifdef NEEDS_LIBICONV
76 EXTLIBS += -liconv 96 EXTLIBS += -liconv
77endif 97endif
78 98
79 99
80.PHONY: all libgit test install uninstall clean force-version get-git 100.PHONY: all libgit test install uninstall clean force-version get-git
81 101
82all: cgit 102all: cgit
83 103
84VERSION: force-version 104VERSION: force-version
85 @./gen-version.sh "$(CGIT_VERSION)" 105 @./gen-version.sh "$(CGIT_VERSION)"
86-include VERSION 106-include VERSION
87 107
88 108
89CFLAGS += -g -Wall -Igit 109CFLAGS += -g -Wall -Igit
90CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 110CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
91CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 111CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
92CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 112CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
93CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 113CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
94CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 114CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
95 115
96ifdef NO_ICONV 116ifdef NO_ICONV
97 CFLAGS += -DNO_ICONV 117 CFLAGS += -DNO_ICONV
98endif 118endif
119ifdef NO_STRCASESTR
120 CFLAGS += -DNO_STRCASESTR
121endif
99 122
100cgit: $(OBJECTS) libgit 123cgit: $(OBJECTS) libgit
101 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 124 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
102 125
103cgit.o: VERSION 126cgit.o: VERSION
104 127
105-include $(OBJECTS:.o=.d) 128-include $(OBJECTS:.o=.d)
106 129
107libgit: 130libgit:
108 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a 131 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
109 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 132 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
110 133
111test: all 134test: all
112 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 135 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
113 136
114install: all 137install: all
115 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 138 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
116 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 139 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
117 install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 140 install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
118 install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png 141 install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
119 142
120uninstall: 143uninstall:
121 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 144 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
122 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 145 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
123 rm -f $(CGIT_SCRIPT_PATH)/cgit.png 146 rm -f $(CGIT_SCRIPT_PATH)/cgit.png
124 147
125clean: 148clean:
126 rm -f cgit VERSION *.o *.d 149 rm -f cgit VERSION *.o *.d
127 150
128get-git: 151get-git:
129 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git 152 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cgit.h b/cgit.h
index 91db98a..92f0c5a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -44,200 +44,194 @@
44#define PAGE_ENCODING "UTF-8" 44#define PAGE_ENCODING "UTF-8"
45 45
46typedef void (*configfn)(const char *name, const char *value); 46typedef void (*configfn)(const char *name, const char *value);
47typedef void (*filepair_fn)(struct diff_filepair *pair); 47typedef void (*filepair_fn)(struct diff_filepair *pair);
48typedef void (*linediff_fn)(char *line, int len); 48typedef void (*linediff_fn)(char *line, int len);
49 49
50struct cgit_repo { 50struct cgit_repo {
51 char *url; 51 char *url;
52 char *name; 52 char *name;
53 char *path; 53 char *path;
54 char *desc; 54 char *desc;
55 char *owner; 55 char *owner;
56 char *defbranch; 56 char *defbranch;
57 char *group; 57 char *group;
58 char *module_link; 58 char *module_link;
59 char *readme; 59 char *readme;
60 char *clone_url; 60 char *clone_url;
61 int snapshots; 61 int snapshots;
62 int enable_log_filecount; 62 int enable_log_filecount;
63 int enable_log_linecount; 63 int enable_log_linecount;
64}; 64};
65 65
66struct cgit_repolist { 66struct cgit_repolist {
67 int length; 67 int length;
68 int count; 68 int count;
69 struct cgit_repo *repos; 69 struct cgit_repo *repos;
70}; 70};
71 71
72struct commitinfo { 72struct commitinfo {
73 struct commit *commit; 73 struct commit *commit;
74 char *author; 74 char *author;
75 char *author_email; 75 char *author_email;
76 unsigned long author_date; 76 unsigned long author_date;
77 char *committer; 77 char *committer;
78 char *committer_email; 78 char *committer_email;
79 unsigned long committer_date; 79 unsigned long committer_date;
80 char *subject; 80 char *subject;
81 char *msg; 81 char *msg;
82 char *msg_encoding; 82 char *msg_encoding;
83}; 83};
84 84
85struct taginfo { 85struct taginfo {
86 char *tagger; 86 char *tagger;
87 char *tagger_email; 87 char *tagger_email;
88 unsigned long tagger_date; 88 unsigned long tagger_date;
89 char *msg; 89 char *msg;
90}; 90};
91 91
92struct refinfo { 92struct refinfo {
93 const char *refname; 93 const char *refname;
94 struct object *object; 94 struct object *object;
95 union { 95 union {
96 struct taginfo *tag; 96 struct taginfo *tag;
97 struct commitinfo *commit; 97 struct commitinfo *commit;
98 }; 98 };
99}; 99};
100 100
101struct reflist { 101struct reflist {
102 struct refinfo **refs; 102 struct refinfo **refs;
103 int alloc; 103 int alloc;
104 int count; 104 int count;
105}; 105};
106 106
107struct cgit_query { 107struct cgit_query {
108 int has_symref; 108 int has_symref;
109 int has_sha1; 109 int has_sha1;
110 char *raw; 110 char *raw;
111 char *repo; 111 char *repo;
112 char *page; 112 char *page;
113 char *search; 113 char *search;
114 char *grep; 114 char *grep;
115 char *head; 115 char *head;
116 char *sha1; 116 char *sha1;
117 char *sha2; 117 char *sha2;
118 char *path; 118 char *path;
119 char *name; 119 char *name;
120 char *mimetype; 120 char *mimetype;
121 char *url; 121 char *url;
122 int ofs; 122 int ofs;
123 int nohead; 123 int nohead;
124}; 124};
125 125
126struct cgit_config { 126struct cgit_config {
127 char *agefile; 127 char *agefile;
128 char *cache_root; 128 char *cache_root;
129 char *clone_prefix; 129 char *clone_prefix;
130 char *css; 130 char *css;
131 char *favicon; 131 char *favicon;
132 char *footer; 132 char *footer;
133 char *index_header; 133 char *index_header;
134 char *index_info; 134 char *index_info;
135 char *logo; 135 char *logo;
136 char *logo_link; 136 char *logo_link;
137 char *module_link; 137 char *module_link;
138 char *repo_group; 138 char *repo_group;
139 char *robots; 139 char *robots;
140 char *root_title; 140 char *root_title;
141 char *root_desc; 141 char *root_desc;
142 char *root_readme; 142 char *root_readme;
143 char *script_name; 143 char *script_name;
144 char *virtual_root; 144 char *virtual_root;
145 int cache_size; 145 int cache_size;
146 int cache_dynamic_ttl; 146 int cache_dynamic_ttl;
147 int cache_max_create_time; 147 int cache_max_create_time;
148 int cache_repo_ttl; 148 int cache_repo_ttl;
149 int cache_root_ttl; 149 int cache_root_ttl;
150 int cache_static_ttl; 150 int cache_static_ttl;
151 int enable_index_links; 151 int enable_index_links;
152 int enable_log_filecount; 152 int enable_log_filecount;
153 int enable_log_linecount; 153 int enable_log_linecount;
154 int local_time; 154 int local_time;
155 int max_repo_count; 155 int max_repo_count;
156 int max_commit_count; 156 int max_commit_count;
157 int max_lock_attempts; 157 int max_lock_attempts;
158 int max_msg_len; 158 int max_msg_len;
159 int max_repodesc_len; 159 int max_repodesc_len;
160 int nocache; 160 int nocache;
161 int renamelimit; 161 int renamelimit;
162 int snapshots; 162 int snapshots;
163 int summary_branches; 163 int summary_branches;
164 int summary_log; 164 int summary_log;
165 int summary_tags; 165 int summary_tags;
166}; 166};
167 167
168struct cgit_page { 168struct cgit_page {
169 time_t modified; 169 time_t modified;
170 time_t expires; 170 time_t expires;
171 size_t size; 171 size_t size;
172 char *mimetype; 172 char *mimetype;
173 char *charset; 173 char *charset;
174 char *filename; 174 char *filename;
175 char *title; 175 char *title;
176}; 176};
177 177
178struct cgit_context { 178struct cgit_context {
179 struct cgit_query qry; 179 struct cgit_query qry;
180 struct cgit_config cfg; 180 struct cgit_config cfg;
181 struct cgit_repo *repo; 181 struct cgit_repo *repo;
182 struct cgit_page page; 182 struct cgit_page page;
183}; 183};
184 184
185struct cgit_snapshot_format { 185struct cgit_snapshot_format {
186 const char *suffix; 186 const char *suffix;
187 const char *mimetype; 187 const char *mimetype;
188 write_archive_fn_t write_func; 188 write_archive_fn_t write_func;
189 int bit; 189 int bit;
190}; 190};
191 191
192extern const char *cgit_version; 192extern const char *cgit_version;
193 193
194extern struct cgit_repolist cgit_repolist; 194extern struct cgit_repolist cgit_repolist;
195extern struct cgit_context ctx; 195extern struct cgit_context ctx;
196extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 196extern const struct cgit_snapshot_format cgit_snapshot_formats[];
197 197
198extern struct cgit_repo *cgit_add_repo(const char *url); 198extern struct cgit_repo *cgit_add_repo(const char *url);
199extern struct cgit_repo *cgit_get_repoinfo(const char *url); 199extern struct cgit_repo *cgit_get_repoinfo(const char *url);
200extern void cgit_repo_config_cb(const char *name, const char *value); 200extern void cgit_repo_config_cb(const char *name, const char *value);
201 201
202extern int chk_zero(int result, char *msg); 202extern int chk_zero(int result, char *msg);
203extern int chk_positive(int result, char *msg); 203extern int chk_positive(int result, char *msg);
204extern int chk_non_negative(int result, char *msg); 204extern int chk_non_negative(int result, char *msg);
205 205
206extern char *trim_end(const char *str, char c); 206extern char *trim_end(const char *str, char c);
207extern char *strlpart(char *txt, int maxlen); 207extern char *strlpart(char *txt, int maxlen);
208extern char *strrpart(char *txt, int maxlen); 208extern char *strrpart(char *txt, int maxlen);
209 209
210extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 210extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
211extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 211extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
212 int flags, void *cb_data); 212 int flags, void *cb_data);
213 213
214extern void *cgit_free_commitinfo(struct commitinfo *info); 214extern void *cgit_free_commitinfo(struct commitinfo *info);
215 215
216extern int cgit_diff_files(const unsigned char *old_sha1, 216extern int cgit_diff_files(const unsigned char *old_sha1,
217 const unsigned char *new_sha1, 217 const unsigned char *new_sha1,
218 linediff_fn fn); 218 linediff_fn fn);
219 219
220extern void cgit_diff_tree(const unsigned char *old_sha1, 220extern void cgit_diff_tree(const unsigned char *old_sha1,
221 const unsigned char *new_sha1, 221 const unsigned char *new_sha1,
222 filepair_fn fn, const char *prefix); 222 filepair_fn fn, const char *prefix);
223 223
224extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 224extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
225 225
226extern char *fmt(const char *format,...); 226extern char *fmt(const char *format,...);
227 227
228extern struct commitinfo *cgit_parse_commit(struct commit *commit); 228extern struct commitinfo *cgit_parse_commit(struct commit *commit);
229extern struct taginfo *cgit_parse_tag(struct tag *tag); 229extern struct taginfo *cgit_parse_tag(struct tag *tag);
230extern void cgit_parse_url(const char *url); 230extern void cgit_parse_url(const char *url);
231 231
232extern const char *cgit_repobasename(const char *reponame); 232extern const char *cgit_repobasename(const char *reponame);
233 233
234extern int cgit_parse_snapshots_mask(const char *str); 234extern int cgit_parse_snapshots_mask(const char *str);
235 235
236/* libgit.a either links against or compiles its own implementation of
237 * strcasestr(), and we'd like to reuse it. Simply re-declaring it
238 * seems to do the trick.
239 */
240extern char *strcasestr(const char *haystack, const char *needle);
241
242 236
243#endif /* CGIT_H */ 237#endif /* CGIT_H */
diff --git a/parsing.c b/parsing.c
index c8f3048..f3f3b15 100644
--- a/parsing.c
+++ b/parsing.c
@@ -1,241 +1,245 @@
1/* config.c: parsing of config files 1/* config.c: parsing of config files
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
11/* 11/*
12 * url syntax: [repo ['/' cmd [ '/' path]]] 12 * url syntax: [repo ['/' cmd [ '/' path]]]
13 * repo: any valid repo url, may contain '/' 13 * repo: any valid repo url, may contain '/'
14 * cmd: log | commit | diff | tree | view | blob | snapshot 14 * cmd: log | commit | diff | tree | view | blob | snapshot
15 * path: any valid path, may contain '/' 15 * path: any valid path, may contain '/'
16 * 16 *
17 */ 17 */
18void cgit_parse_url(const char *url) 18void cgit_parse_url(const char *url)
19{ 19{
20 char *cmd, *p; 20 char *cmd, *p;
21 21
22 ctx.repo = NULL; 22 ctx.repo = NULL;
23 if (!url || url[0] == '\0') 23 if (!url || url[0] == '\0')
24 return; 24 return;
25 25
26 ctx.repo = cgit_get_repoinfo(url); 26 ctx.repo = cgit_get_repoinfo(url);
27 if (ctx.repo) { 27 if (ctx.repo) {
28 ctx.qry.repo = ctx.repo->url; 28 ctx.qry.repo = ctx.repo->url;
29 return; 29 return;
30 } 30 }
31 31
32 cmd = strchr(url, '/'); 32 cmd = strchr(url, '/');
33 while (!ctx.repo && cmd) { 33 while (!ctx.repo && cmd) {
34 cmd[0] = '\0'; 34 cmd[0] = '\0';
35 ctx.repo = cgit_get_repoinfo(url); 35 ctx.repo = cgit_get_repoinfo(url);
36 if (ctx.repo == NULL) { 36 if (ctx.repo == NULL) {
37 cmd[0] = '/'; 37 cmd[0] = '/';
38 cmd = strchr(cmd + 1, '/'); 38 cmd = strchr(cmd + 1, '/');
39 continue; 39 continue;
40 } 40 }
41 41
42 ctx.qry.repo = ctx.repo->url; 42 ctx.qry.repo = ctx.repo->url;
43 p = strchr(cmd + 1, '/'); 43 p = strchr(cmd + 1, '/');
44 if (p) { 44 if (p) {
45 p[0] = '\0'; 45 p[0] = '\0';
46 if (p[1]) 46 if (p[1])
47 ctx.qry.path = trim_end(p + 1, '/'); 47 ctx.qry.path = trim_end(p + 1, '/');
48 } 48 }
49 if (cmd[1]) 49 if (cmd[1])
50 ctx.qry.page = xstrdup(cmd + 1); 50 ctx.qry.page = xstrdup(cmd + 1);
51 return; 51 return;
52 } 52 }
53} 53}
54 54
55char *substr(const char *head, const char *tail) 55char *substr(const char *head, const char *tail)
56{ 56{
57 char *buf; 57 char *buf;
58 58
59 buf = xmalloc(tail - head + 1); 59 buf = xmalloc(tail - head + 1);
60 strncpy(buf, head, tail - head); 60 strncpy(buf, head, tail - head);
61 buf[tail - head] = '\0'; 61 buf[tail - head] = '\0';
62 return buf; 62 return buf;
63} 63}
64 64
65char *parse_user(char *t, char **name, char **email, unsigned long *date) 65char *parse_user(char *t, char **name, char **email, unsigned long *date)
66{ 66{
67 char *p = t; 67 char *p = t;
68 int mode = 1; 68 int mode = 1;
69 69
70 while (p && *p) { 70 while (p && *p) {
71 if (mode == 1 && *p == '<') { 71 if (mode == 1 && *p == '<') {
72 *name = substr(t, p - 1); 72 *name = substr(t, p - 1);
73 t = p; 73 t = p;
74 mode++; 74 mode++;
75 } else if (mode == 1 && *p == '\n') { 75 } else if (mode == 1 && *p == '\n') {
76 *name = substr(t, p); 76 *name = substr(t, p);
77 p++; 77 p++;
78 break; 78 break;
79 } else if (mode == 2 && *p == '>') { 79 } else if (mode == 2 && *p == '>') {
80 *email = substr(t, p + 1); 80 *email = substr(t, p + 1);
81 t = p; 81 t = p;
82 mode++; 82 mode++;
83 } else if (mode == 2 && *p == '\n') { 83 } else if (mode == 2 && *p == '\n') {
84 *email = substr(t, p); 84 *email = substr(t, p);
85 p++; 85 p++;
86 break; 86 break;
87 } else if (mode == 3 && isdigit(*p)) { 87 } else if (mode == 3 && isdigit(*p)) {
88 *date = atol(p); 88 *date = atol(p);
89 mode++; 89 mode++;
90 } else if (*p == '\n') { 90 } else if (*p == '\n') {
91 p++; 91 p++;
92 break; 92 break;
93 } 93 }
94 p++; 94 p++;
95 } 95 }
96 return p; 96 return p;
97} 97}
98 98
99#ifdef NO_ICONV
100#define reencode(a, b, c)
101#else
99const char *reencode(char **txt, const char *src_enc, const char *dst_enc) 102const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
100{ 103{
101 char *tmp; 104 char *tmp;
102 105
103 if (!txt || !*txt || !src_enc || !dst_enc) 106 if (!txt || !*txt || !src_enc || !dst_enc)
104 return *txt; 107 return *txt;
105 108
106 tmp = reencode_string(*txt, src_enc, dst_enc); 109 tmp = reencode_string(*txt, src_enc, dst_enc);
107 if (tmp) { 110 if (tmp) {
108 free(*txt); 111 free(*txt);
109 *txt = tmp; 112 *txt = tmp;
110 } 113 }
111 return *txt; 114 return *txt;
112} 115}
116#endif
113 117
114struct commitinfo *cgit_parse_commit(struct commit *commit) 118struct commitinfo *cgit_parse_commit(struct commit *commit)
115{ 119{
116 struct commitinfo *ret; 120 struct commitinfo *ret;
117 char *p = commit->buffer, *t = commit->buffer; 121 char *p = commit->buffer, *t = commit->buffer;
118 122
119 ret = xmalloc(sizeof(*ret)); 123 ret = xmalloc(sizeof(*ret));
120 ret->commit = commit; 124 ret->commit = commit;
121 ret->author = NULL; 125 ret->author = NULL;
122 ret->author_email = NULL; 126 ret->author_email = NULL;
123 ret->committer = NULL; 127 ret->committer = NULL;
124 ret->committer_email = NULL; 128 ret->committer_email = NULL;
125 ret->subject = NULL; 129 ret->subject = NULL;
126 ret->msg = NULL; 130 ret->msg = NULL;
127 ret->msg_encoding = NULL; 131 ret->msg_encoding = NULL;
128 132
129 if (p == NULL) 133 if (p == NULL)
130 return ret; 134 return ret;
131 135
132 if (strncmp(p, "tree ", 5)) 136 if (strncmp(p, "tree ", 5))
133 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 137 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
134 else 138 else
135 p += 46; // "tree " + hex[40] + "\n" 139 p += 46; // "tree " + hex[40] + "\n"
136 140
137 while (!strncmp(p, "parent ", 7)) 141 while (!strncmp(p, "parent ", 7))
138 p += 48; // "parent " + hex[40] + "\n" 142 p += 48; // "parent " + hex[40] + "\n"
139 143
140 if (p && !strncmp(p, "author ", 7)) { 144 if (p && !strncmp(p, "author ", 7)) {
141 p = parse_user(p + 7, &ret->author, &ret->author_email, 145 p = parse_user(p + 7, &ret->author, &ret->author_email,
142 &ret->author_date); 146 &ret->author_date);
143 } 147 }
144 148
145 if (p && !strncmp(p, "committer ", 9)) { 149 if (p && !strncmp(p, "committer ", 9)) {
146 p = parse_user(p + 9, &ret->committer, &ret->committer_email, 150 p = parse_user(p + 9, &ret->committer, &ret->committer_email,
147 &ret->committer_date); 151 &ret->committer_date);
148 } 152 }
149 153
150 if (p && !strncmp(p, "encoding ", 9)) { 154 if (p && !strncmp(p, "encoding ", 9)) {
151 p += 9; 155 p += 9;
152 t = strchr(p, '\n'); 156 t = strchr(p, '\n');
153 if (t) { 157 if (t) {
154 ret->msg_encoding = substr(p, t + 1); 158 ret->msg_encoding = substr(p, t + 1);
155 p = t + 1; 159 p = t + 1;
156 } 160 }
157 } 161 }
158 162
159 // skip unknown header fields 163 // skip unknown header fields
160 while (p && *p && (*p != '\n')) { 164 while (p && *p && (*p != '\n')) {
161 p = strchr(p, '\n'); 165 p = strchr(p, '\n');
162 if (p) 166 if (p)
163 p++; 167 p++;
164 } 168 }
165 169
166 // skip empty lines between headers and message 170 // skip empty lines between headers and message
167 while (p && *p == '\n') 171 while (p && *p == '\n')
168 p++; 172 p++;
169 173
170 if (!p) 174 if (!p)
171 return ret; 175 return ret;
172 176
173 t = strchr(p, '\n'); 177 t = strchr(p, '\n');
174 if (t) { 178 if (t) {
175 ret->subject = substr(p, t); 179 ret->subject = substr(p, t);
176 p = t + 1; 180 p = t + 1;
177 181
178 while (p && *p == '\n') { 182 while (p && *p == '\n') {
179 p = strchr(p, '\n'); 183 p = strchr(p, '\n');
180 if (p) 184 if (p)
181 p++; 185 p++;
182 } 186 }
183 if (p) 187 if (p)
184 ret->msg = xstrdup(p); 188 ret->msg = xstrdup(p);
185 } else 189 } else
186 ret->subject = xstrdup(p); 190 ret->subject = xstrdup(p);
187 191
188 if (ret->msg_encoding) { 192 if (ret->msg_encoding) {
189 reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding); 193 reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding);
190 reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding); 194 reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding);
191 } 195 }
192 196
193 return ret; 197 return ret;
194} 198}
195 199
196 200
197struct taginfo *cgit_parse_tag(struct tag *tag) 201struct taginfo *cgit_parse_tag(struct tag *tag)
198{ 202{
199 void *data; 203 void *data;
200 enum object_type type; 204 enum object_type type;
201 unsigned long size; 205 unsigned long size;
202 char *p; 206 char *p;
203 struct taginfo *ret; 207 struct taginfo *ret;
204 208
205 data = read_sha1_file(tag->object.sha1, &type, &size); 209 data = read_sha1_file(tag->object.sha1, &type, &size);
206 if (!data || type != OBJ_TAG) { 210 if (!data || type != OBJ_TAG) {
207 free(data); 211 free(data);
208 return 0; 212 return 0;
209 } 213 }
210 214
211 ret = xmalloc(sizeof(*ret)); 215 ret = xmalloc(sizeof(*ret));
212 ret->tagger = NULL; 216 ret->tagger = NULL;
213 ret->tagger_email = NULL; 217 ret->tagger_email = NULL;
214 ret->tagger_date = 0; 218 ret->tagger_date = 0;
215 ret->msg = NULL; 219 ret->msg = NULL;
216 220
217 p = data; 221 p = data;
218 222
219 while (p && *p) { 223 while (p && *p) {
220 if (*p == '\n') 224 if (*p == '\n')
221 break; 225 break;
222 226
223 if (!strncmp(p, "tagger ", 7)) { 227 if (!strncmp(p, "tagger ", 7)) {
224 p = parse_user(p + 7, &ret->tagger, &ret->tagger_email, 228 p = parse_user(p + 7, &ret->tagger, &ret->tagger_email,
225 &ret->tagger_date); 229 &ret->tagger_date);
226 } else { 230 } else {
227 p = strchr(p, '\n'); 231 p = strchr(p, '\n');
228 if (p) 232 if (p)
229 p++; 233 p++;
230 } 234 }
231 } 235 }
232 236
233 // skip empty lines between headers and message 237 // skip empty lines between headers and message
234 while (p && *p == '\n') 238 while (p && *p == '\n')
235 p++; 239 p++;
236 240
237 if (p && *p) 241 if (p && *p)
238 ret->msg = xstrdup(p); 242 ret->msg = xstrdup(p);
239 free(data); 243 free(data);
240 return ret; 244 return ret;
241} 245}
diff --git a/ui-log.c b/ui-log.c
index 8dd8b89..d212984 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,155 +1,168 @@
1/* ui-log.c: functions for log output 1/* ui-log.c: functions for log 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 "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13int files, add_lines, rem_lines; 13int files, add_lines, rem_lines;
14 14
15void count_lines(char *line, int size) 15void count_lines(char *line, int size)
16{ 16{
17 if (size <= 0) 17 if (size <= 0)
18 return; 18 return;
19 19
20 if (line[0] == '+') 20 if (line[0] == '+')
21 add_lines++; 21 add_lines++;
22 22
23 else if (line[0] == '-') 23 else if (line[0] == '-')
24 rem_lines++; 24 rem_lines++;
25} 25}
26 26
27void inspect_files(struct diff_filepair *pair) 27void inspect_files(struct diff_filepair *pair)
28{ 28{
29 files++; 29 files++;
30 if (ctx.repo->enable_log_linecount) 30 if (ctx.repo->enable_log_linecount)
31 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 31 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
32} 32}
33 33
34void print_commit(struct commit *commit) 34void print_commit(struct commit *commit)
35{ 35{
36 struct commitinfo *info; 36 struct commitinfo *info;
37 char *tmp; 37 char *tmp;
38 38
39 info = cgit_parse_commit(commit); 39 info = cgit_parse_commit(commit);
40 html("<tr><td>"); 40 html("<tr><td>");
41 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 41 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
42 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); 42 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
43 html_link_open(tmp, NULL, NULL); 43 html_link_open(tmp, NULL, NULL);
44 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 44 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
45 html_link_close(); 45 html_link_close();
46 html("</td><td>"); 46 html("</td><td>");
47 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 47 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
48 sha1_to_hex(commit->object.sha1)); 48 sha1_to_hex(commit->object.sha1));
49 html("</td><td>"); 49 html("</td><td>");
50 html_txt(info->author); 50 html_txt(info->author);
51 if (ctx.repo->enable_log_filecount) { 51 if (ctx.repo->enable_log_filecount) {
52 files = 0; 52 files = 0;
53 add_lines = 0; 53 add_lines = 0;
54 rem_lines = 0; 54 rem_lines = 0;
55 cgit_diff_commit(commit, inspect_files); 55 cgit_diff_commit(commit, inspect_files);
56 html("</td><td>"); 56 html("</td><td>");
57 htmlf("%d", files); 57 htmlf("%d", files);
58 if (ctx.repo->enable_log_linecount) { 58 if (ctx.repo->enable_log_linecount) {
59 html("</td><td>"); 59 html("</td><td>");
60 htmlf("-%d/+%d", rem_lines, add_lines); 60 htmlf("-%d/+%d", rem_lines, add_lines);
61 } 61 }
62 } 62 }
63 html("</td></tr>\n"); 63 html("</td></tr>\n");
64 cgit_free_commitinfo(info); 64 cgit_free_commitinfo(info);
65} 65}
66 66
67static const char *disambiguate_ref(const char *ref)
68{
69 unsigned char sha1[20];
70 const char *longref;
71
72 longref = fmt("refs/heads/%s", ref);
73 if (get_sha1(longref, sha1) == 0)
74 return longref;
75
76 return ref;
77}
67 78
68void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, 79void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
69 char *path, int pager) 80 char *path, int pager)
70{ 81{
71 struct rev_info rev; 82 struct rev_info rev;
72 struct commit *commit; 83 struct commit *commit;
73 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 84 const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
74 int argc = 2; 85 int argc = 2;
75 int i, columns = 3; 86 int i, columns = 3;
76 87
77 if (!tip) 88 if (!tip)
78 argv[1] = ctx.qry.head; 89 tip = ctx.qry.head;
90
91 argv[1] = disambiguate_ref(tip);
79 92
80 if (grep && pattern && (!strcmp(grep, "grep") || 93 if (grep && pattern && (!strcmp(grep, "grep") ||
81 !strcmp(grep, "author") || 94 !strcmp(grep, "author") ||
82 !strcmp(grep, "committer"))) 95 !strcmp(grep, "committer")))
83 argv[argc++] = fmt("--%s=%s", grep, pattern); 96 argv[argc++] = fmt("--%s=%s", grep, pattern);
84 97
85 if (path) { 98 if (path) {
86 argv[argc++] = "--"; 99 argv[argc++] = "--";
87 argv[argc++] = path; 100 argv[argc++] = path;
88 } 101 }
89 init_revisions(&rev, NULL); 102 init_revisions(&rev, NULL);
90 rev.abbrev = DEFAULT_ABBREV; 103 rev.abbrev = DEFAULT_ABBREV;
91 rev.commit_format = CMIT_FMT_DEFAULT; 104 rev.commit_format = CMIT_FMT_DEFAULT;
92 rev.verbose_header = 1; 105 rev.verbose_header = 1;
93 rev.show_root_diff = 0; 106 rev.show_root_diff = 0;
94 setup_revisions(argc, argv, &rev, NULL); 107 setup_revisions(argc, argv, &rev, NULL);
95 rev.grep_filter.regflags |= REG_ICASE; 108 rev.grep_filter.regflags |= REG_ICASE;
96 compile_grep_patterns(&rev.grep_filter); 109 compile_grep_patterns(&rev.grep_filter);
97 prepare_revision_walk(&rev); 110 prepare_revision_walk(&rev);
98 111
99 if (pager) 112 if (pager)
100 html("<table class='list nowrap'>"); 113 html("<table class='list nowrap'>");
101 114
102 html("<tr class='nohover'><th class='left'>Age</th>" 115 html("<tr class='nohover'><th class='left'>Age</th>"
103 "<th class='left'>Commit message</th>" 116 "<th class='left'>Commit message</th>"
104 "<th class='left'>Author</th>"); 117 "<th class='left'>Author</th>");
105 if (ctx.repo->enable_log_filecount) { 118 if (ctx.repo->enable_log_filecount) {
106 html("<th class='left'>Files</th>"); 119 html("<th class='left'>Files</th>");
107 columns++; 120 columns++;
108 if (ctx.repo->enable_log_linecount) { 121 if (ctx.repo->enable_log_linecount) {
109 html("<th class='left'>Lines</th>"); 122 html("<th class='left'>Lines</th>");
110 columns++; 123 columns++;
111 } 124 }
112 } 125 }
113 html("</tr>\n"); 126 html("</tr>\n");
114 127
115 if (ofs<0) 128 if (ofs<0)
116 ofs = 0; 129 ofs = 0;
117 130
118 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 131 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
119 free(commit->buffer); 132 free(commit->buffer);
120 commit->buffer = NULL; 133 commit->buffer = NULL;
121 free_commit_list(commit->parents); 134 free_commit_list(commit->parents);
122 commit->parents = NULL; 135 commit->parents = NULL;
123 } 136 }
124 137
125 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 138 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
126 print_commit(commit); 139 print_commit(commit);
127 free(commit->buffer); 140 free(commit->buffer);
128 commit->buffer = NULL; 141 commit->buffer = NULL;
129 free_commit_list(commit->parents); 142 free_commit_list(commit->parents);
130 commit->parents = NULL; 143 commit->parents = NULL;
131 } 144 }
132 if (pager) { 145 if (pager) {
133 htmlf("</table><div class='pager'>", 146 htmlf("</table><div class='pager'>",
134 columns); 147 columns);
135 if (ofs > 0) { 148 if (ofs > 0) {
136 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, 149 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
137 ctx.qry.sha1, ctx.qry.path, 150 ctx.qry.sha1, ctx.qry.path,
138 ofs - cnt, ctx.qry.grep, 151 ofs - cnt, ctx.qry.grep,
139 ctx.qry.search); 152 ctx.qry.search);
140 html("&nbsp;"); 153 html("&nbsp;");
141 } 154 }
142 if ((commit = get_revision(&rev)) != NULL) { 155 if ((commit = get_revision(&rev)) != NULL) {
143 cgit_log_link("[next]", NULL, NULL, ctx.qry.head, 156 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
144 ctx.qry.sha1, ctx.qry.path, 157 ctx.qry.sha1, ctx.qry.path,
145 ofs + cnt, ctx.qry.grep, 158 ofs + cnt, ctx.qry.grep,
146 ctx.qry.search); 159 ctx.qry.search);
147 } 160 }
148 html("</div>"); 161 html("</div>");
149 } else if ((commit = get_revision(&rev)) != NULL) { 162 } else if ((commit = get_revision(&rev)) != NULL) {
150 html("<tr class='nohover'><td colspan='3'>"); 163 html("<tr class='nohover'><td colspan='3'>");
151 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, 164 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
152 NULL, NULL); 165 NULL, NULL);
153 html("</td></tr>\n"); 166 html("</td></tr>\n");
154 } 167 }
155} 168}
diff --git a/ui-repolist.c b/ui-repolist.c
index c23232c..2324273 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,167 +1,171 @@
1/* ui-repolist.c: functions for generating the repolist page 1/* ui-repolist.c: functions for generating the repolist page
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/* This is needed for strcasestr to be defined by <string.h> */
10#define _GNU_SOURCE 1
11#include <string.h>
12
9#include <time.h> 13#include <time.h>
10 14
11#include "cgit.h" 15#include "cgit.h"
12#include "html.h" 16#include "html.h"
13#include "ui-shared.h" 17#include "ui-shared.h"
14 18
15time_t read_agefile(char *path) 19time_t read_agefile(char *path)
16{ 20{
17 FILE *f; 21 FILE *f;
18 static char buf[64], buf2[64]; 22 static char buf[64], buf2[64];
19 23
20 if (!(f = fopen(path, "r"))) 24 if (!(f = fopen(path, "r")))
21 return -1; 25 return -1;
22 if (fgets(buf, sizeof(buf), f) == NULL) 26 if (fgets(buf, sizeof(buf), f) == NULL)
23 return -1; 27 return -1;
24 fclose(f); 28 fclose(f);
25 if (parse_date(buf, buf2, sizeof(buf2))) 29 if (parse_date(buf, buf2, sizeof(buf2)))
26 return strtoul(buf2, NULL, 10); 30 return strtoul(buf2, NULL, 10);
27 else 31 else
28 return 0; 32 return 0;
29} 33}
30 34
31static void print_modtime(struct cgit_repo *repo) 35static void print_modtime(struct cgit_repo *repo)
32{ 36{
33 char *path; 37 char *path;
34 struct stat s; 38 struct stat s;
35 39
36 path = fmt("%s/%s", repo->path, ctx.cfg.agefile); 40 path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
37 if (stat(path, &s) == 0) { 41 if (stat(path, &s) == 0) {
38 cgit_print_age(read_agefile(path), -1, NULL); 42 cgit_print_age(read_agefile(path), -1, NULL);
39 return; 43 return;
40 } 44 }
41 45
42 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); 46 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
43 if (stat(path, &s) != 0) 47 if (stat(path, &s) != 0)
44 return; 48 return;
45 cgit_print_age(s.st_mtime, -1, NULL); 49 cgit_print_age(s.st_mtime, -1, NULL);
46} 50}
47 51
48int is_match(struct cgit_repo *repo) 52int is_match(struct cgit_repo *repo)
49{ 53{
50 if (!ctx.qry.search) 54 if (!ctx.qry.search)
51 return 1; 55 return 1;
52 if (repo->url && strcasestr(repo->url, ctx.qry.search)) 56 if (repo->url && strcasestr(repo->url, ctx.qry.search))
53 return 1; 57 return 1;
54 if (repo->name && strcasestr(repo->name, ctx.qry.search)) 58 if (repo->name && strcasestr(repo->name, ctx.qry.search))
55 return 1; 59 return 1;
56 if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) 60 if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
57 return 1; 61 return 1;
58 if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) 62 if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
59 return 1; 63 return 1;
60 return 0; 64 return 0;
61} 65}
62 66
63int is_in_url(struct cgit_repo *repo) 67int is_in_url(struct cgit_repo *repo)
64{ 68{
65 if (!ctx.qry.url) 69 if (!ctx.qry.url)
66 return 1; 70 return 1;
67 if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) 71 if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
68 return 1; 72 return 1;
69 return 0; 73 return 0;
70} 74}
71 75
72void print_header(int columns) 76void print_header(int columns)
73{ 77{
74 html("<tr class='nohover'>" 78 html("<tr class='nohover'>"
75 "<th class='left'>Name</th>" 79 "<th class='left'>Name</th>"
76 "<th class='left'>Description</th>" 80 "<th class='left'>Description</th>"
77 "<th class='left'>Owner</th>" 81 "<th class='left'>Owner</th>"
78 "<th class='left'>Idle</th>"); 82 "<th class='left'>Idle</th>");
79 if (ctx.cfg.enable_index_links) 83 if (ctx.cfg.enable_index_links)
80 html("<th class='left'>Links</th>"); 84 html("<th class='left'>Links</th>");
81 html("</tr>\n"); 85 html("</tr>\n");
82} 86}
83 87
84 88
85void print_pager(int items, int pagelen, char *search) 89void print_pager(int items, int pagelen, char *search)
86{ 90{
87 int i; 91 int i;
88 html("<div class='pager'>"); 92 html("<div class='pager'>");
89 for(i = 0; i * pagelen < items; i++) 93 for(i = 0; i * pagelen < items; i++)
90 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, 94 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
91 search, i * pagelen); 95 search, i * pagelen);
92 html("</div>"); 96 html("</div>");
93} 97}
94 98
95void cgit_print_repolist() 99void cgit_print_repolist()
96{ 100{
97 int i, columns = 4, hits = 0, header = 0; 101 int i, columns = 4, hits = 0, header = 0;
98 char *last_group = NULL; 102 char *last_group = NULL;
99 103
100 if (ctx.cfg.enable_index_links) 104 if (ctx.cfg.enable_index_links)
101 columns++; 105 columns++;
102 106
103 ctx.page.title = ctx.cfg.root_title; 107 ctx.page.title = ctx.cfg.root_title;
104 cgit_print_http_headers(&ctx); 108 cgit_print_http_headers(&ctx);
105 cgit_print_docstart(&ctx); 109 cgit_print_docstart(&ctx);
106 cgit_print_pageheader(&ctx); 110 cgit_print_pageheader(&ctx);
107 111
108 if (ctx.cfg.index_header) 112 if (ctx.cfg.index_header)
109 html_include(ctx.cfg.index_header); 113 html_include(ctx.cfg.index_header);
110 114
111 html("<table summary='repository list' class='list nowrap'>"); 115 html("<table summary='repository list' class='list nowrap'>");
112 for (i=0; i<cgit_repolist.count; i++) { 116 for (i=0; i<cgit_repolist.count; i++) {
113 ctx.repo = &cgit_repolist.repos[i]; 117 ctx.repo = &cgit_repolist.repos[i];
114 if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) 118 if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
115 continue; 119 continue;
116 hits++; 120 hits++;
117 if (hits <= ctx.qry.ofs) 121 if (hits <= ctx.qry.ofs)
118 continue; 122 continue;
119 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) 123 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
120 continue; 124 continue;
121 if (!header++) 125 if (!header++)
122 print_header(columns); 126 print_header(columns);
123 if ((last_group == NULL && ctx.repo->group != NULL) || 127 if ((last_group == NULL && ctx.repo->group != NULL) ||
124 (last_group != NULL && ctx.repo->group == NULL) || 128 (last_group != NULL && ctx.repo->group == NULL) ||
125 (last_group != NULL && ctx.repo->group != NULL && 129 (last_group != NULL && ctx.repo->group != NULL &&
126 strcmp(ctx.repo->group, last_group))) { 130 strcmp(ctx.repo->group, last_group))) {
127 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", 131 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
128 columns); 132 columns);
129 html_txt(ctx.repo->group); 133 html_txt(ctx.repo->group);
130 html("</td></tr>"); 134 html("</td></tr>");
131 last_group = ctx.repo->group; 135 last_group = ctx.repo->group;
132 } 136 }
133 htmlf("<tr><td class='%s'>", 137 htmlf("<tr><td class='%s'>",
134 ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); 138 ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
135 cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); 139 cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
136 html("</td><td>"); 140 html("</td><td>");
137 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); 141 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
138 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); 142 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
139 html_link_close(); 143 html_link_close();
140 html("</td><td>"); 144 html("</td><td>");
141 html_txt(ctx.repo->owner); 145 html_txt(ctx.repo->owner);
142 html("</td><td>"); 146 html("</td><td>");
143 print_modtime(ctx.repo); 147 print_modtime(ctx.repo);
144 html("</td>"); 148 html("</td>");
145 if (ctx.cfg.enable_index_links) { 149 if (ctx.cfg.enable_index_links) {
146 html("<td>"); 150 html("<td>");
147 cgit_summary_link("summary", NULL, "button", NULL); 151 cgit_summary_link("summary", NULL, "button", NULL);
148 cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 152 cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
149 0, NULL, NULL); 153 0, NULL, NULL);
150 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); 154 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
151 html("</td>"); 155 html("</td>");
152 } 156 }
153 html("</tr>\n"); 157 html("</tr>\n");
154 } 158 }
155 html("</table>"); 159 html("</table>");
156 if (!hits) 160 if (!hits)
157 cgit_print_error("No repositories found"); 161 cgit_print_error("No repositories found");
158 else if (hits > ctx.cfg.max_repo_count) 162 else if (hits > ctx.cfg.max_repo_count)
159 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); 163 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
160 cgit_print_docend(); 164 cgit_print_docend();
161} 165}
162 166
163void cgit_print_site_readme() 167void cgit_print_site_readme()
164{ 168{
165 if (ctx.cfg.root_readme) 169 if (ctx.cfg.root_readme)
166 html_include(ctx.cfg.root_readme); 170 html_include(ctx.cfg.root_readme);
167} 171}