summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-11 20:57:21 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-11 20:57:21 (UTC)
commitd267d88c9cb1fb4a45120b86e410ab604626c6bb (patch) (unidiff)
tree55ee3a76da83a6272e446f5201928fe1753ea30d
parent1b7c5b2e0b918e9452694aace7c19194683989a8 (diff)
downloadcgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.zip
cgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.tar.gz
cgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.tar.bz2
Add support for "robots" meta-tag
With this change, cgit will start to generate the "robots" meta-tag, using a default value of "index, nofollow". The default value can be modified with a new cgitrc variable, "robots". Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--cgitrc5
-rw-r--r--shared.c3
-rw-r--r--ui-shared.c2
4 files changed, 11 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index 6291c58..ab0efeb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,290 +1,291 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <xdiff/xdiff.h> 18#include <xdiff/xdiff.h>
19#include <utf8.h> 19#include <utf8.h>
20 20
21 21
22/* 22/*
23 * The valid cgit repo-commands 23 * The valid cgit repo-commands
24 */ 24 */
25#define CMD_LOG 1 25#define CMD_LOG 1
26#define CMD_COMMIT 2 26#define CMD_COMMIT 2
27#define CMD_DIFF 3 27#define CMD_DIFF 3
28#define CMD_TREE 4 28#define CMD_TREE 4
29#define CMD_BLOB 5 29#define CMD_BLOB 5
30#define CMD_SNAPSHOT 6 30#define CMD_SNAPSHOT 6
31#define CMD_TAG 7 31#define CMD_TAG 7
32#define CMD_REFS 8 32#define CMD_REFS 8
33 33
34/* 34/*
35 * Dateformats used on misc. pages 35 * Dateformats used on misc. pages
36 */ 36 */
37#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" 37#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
38#define FMT_SHORTDATE "%Y-%m-%d" 38#define FMT_SHORTDATE "%Y-%m-%d"
39 39
40 40
41/* 41/*
42 * Limits used for relative dates 42 * Limits used for relative dates
43 */ 43 */
44#define TM_MIN 60 44#define TM_MIN 60
45#define TM_HOUR (TM_MIN * 60) 45#define TM_HOUR (TM_MIN * 60)
46#define TM_DAY (TM_HOUR * 24) 46#define TM_DAY (TM_HOUR * 24)
47#define TM_WEEK (TM_DAY * 7) 47#define TM_WEEK (TM_DAY * 7)
48#define TM_YEAR (TM_DAY * 365) 48#define TM_YEAR (TM_DAY * 365)
49#define TM_MONTH (TM_YEAR / 12.0) 49#define TM_MONTH (TM_YEAR / 12.0)
50 50
51 51
52/* 52/*
53 * Default encoding 53 * Default encoding
54 */ 54 */
55#define PAGE_ENCODING "UTF-8" 55#define PAGE_ENCODING "UTF-8"
56 56
57typedef void (*configfn)(const char *name, const char *value); 57typedef void (*configfn)(const char *name, const char *value);
58typedef void (*filepair_fn)(struct diff_filepair *pair); 58typedef void (*filepair_fn)(struct diff_filepair *pair);
59typedef void (*linediff_fn)(char *line, int len); 59typedef void (*linediff_fn)(char *line, int len);
60 60
61struct cacheitem { 61struct cacheitem {
62 char *name; 62 char *name;
63 struct stat st; 63 struct stat st;
64 int ttl; 64 int ttl;
65 int fd; 65 int fd;
66}; 66};
67 67
68struct repoinfo { 68struct repoinfo {
69 char *url; 69 char *url;
70 char *name; 70 char *name;
71 char *path; 71 char *path;
72 char *desc; 72 char *desc;
73 char *owner; 73 char *owner;
74 char *defbranch; 74 char *defbranch;
75 char *group; 75 char *group;
76 char *module_link; 76 char *module_link;
77 char *readme; 77 char *readme;
78 int snapshots; 78 int snapshots;
79 int enable_log_filecount; 79 int enable_log_filecount;
80 int enable_log_linecount; 80 int enable_log_linecount;
81}; 81};
82 82
83struct repolist { 83struct repolist {
84 int length; 84 int length;
85 int count; 85 int count;
86 struct repoinfo *repos; 86 struct repoinfo *repos;
87}; 87};
88 88
89struct commitinfo { 89struct commitinfo {
90 struct commit *commit; 90 struct commit *commit;
91 char *author; 91 char *author;
92 char *author_email; 92 char *author_email;
93 unsigned long author_date; 93 unsigned long author_date;
94 char *committer; 94 char *committer;
95 char *committer_email; 95 char *committer_email;
96 unsigned long committer_date; 96 unsigned long committer_date;
97 char *subject; 97 char *subject;
98 char *msg; 98 char *msg;
99 char *msg_encoding; 99 char *msg_encoding;
100}; 100};
101 101
102struct taginfo { 102struct taginfo {
103 char *tagger; 103 char *tagger;
104 char *tagger_email; 104 char *tagger_email;
105 int tagger_date; 105 int tagger_date;
106 char *msg; 106 char *msg;
107}; 107};
108 108
109struct refinfo { 109struct refinfo {
110 const char *refname; 110 const char *refname;
111 struct object *object; 111 struct object *object;
112 union { 112 union {
113 struct taginfo *tag; 113 struct taginfo *tag;
114 struct commitinfo *commit; 114 struct commitinfo *commit;
115 }; 115 };
116}; 116};
117 117
118struct reflist { 118struct reflist {
119 struct refinfo **refs; 119 struct refinfo **refs;
120 int alloc; 120 int alloc;
121 int count; 121 int count;
122}; 122};
123 123
124extern const char *cgit_version; 124extern const char *cgit_version;
125 125
126extern struct repolist cgit_repolist; 126extern struct repolist cgit_repolist;
127extern struct repoinfo *cgit_repo; 127extern struct repoinfo *cgit_repo;
128extern int cgit_cmd; 128extern int cgit_cmd;
129 129
130extern char *cgit_root_title; 130extern char *cgit_root_title;
131extern char *cgit_css; 131extern char *cgit_css;
132extern char *cgit_logo; 132extern char *cgit_logo;
133extern char *cgit_index_header; 133extern char *cgit_index_header;
134extern char *cgit_index_info; 134extern char *cgit_index_info;
135extern char *cgit_logo_link; 135extern char *cgit_logo_link;
136extern char *cgit_module_link; 136extern char *cgit_module_link;
137extern char *cgit_agefile; 137extern char *cgit_agefile;
138extern char *cgit_virtual_root; 138extern char *cgit_virtual_root;
139extern char *cgit_script_name; 139extern char *cgit_script_name;
140extern char *cgit_cache_root; 140extern char *cgit_cache_root;
141extern char *cgit_repo_group; 141extern char *cgit_repo_group;
142extern char *cgit_robots;
142 143
143extern int cgit_nocache; 144extern int cgit_nocache;
144extern int cgit_snapshots; 145extern int cgit_snapshots;
145extern int cgit_enable_index_links; 146extern int cgit_enable_index_links;
146extern int cgit_enable_log_filecount; 147extern int cgit_enable_log_filecount;
147extern int cgit_enable_log_linecount; 148extern int cgit_enable_log_linecount;
148extern int cgit_max_lock_attempts; 149extern int cgit_max_lock_attempts;
149extern int cgit_cache_root_ttl; 150extern int cgit_cache_root_ttl;
150extern int cgit_cache_repo_ttl; 151extern int cgit_cache_repo_ttl;
151extern int cgit_cache_dynamic_ttl; 152extern int cgit_cache_dynamic_ttl;
152extern int cgit_cache_static_ttl; 153extern int cgit_cache_static_ttl;
153extern int cgit_cache_max_create_time; 154extern int cgit_cache_max_create_time;
154extern int cgit_summary_log; 155extern int cgit_summary_log;
155extern int cgit_summary_tags; 156extern int cgit_summary_tags;
156extern int cgit_summary_branches; 157extern int cgit_summary_branches;
157 158
158extern int cgit_max_msg_len; 159extern int cgit_max_msg_len;
159extern int cgit_max_repodesc_len; 160extern int cgit_max_repodesc_len;
160extern int cgit_max_commit_count; 161extern int cgit_max_commit_count;
161 162
162extern int cgit_query_has_symref; 163extern int cgit_query_has_symref;
163extern int cgit_query_has_sha1; 164extern int cgit_query_has_sha1;
164 165
165extern char *cgit_querystring; 166extern char *cgit_querystring;
166extern char *cgit_query_repo; 167extern char *cgit_query_repo;
167extern char *cgit_query_page; 168extern char *cgit_query_page;
168extern char *cgit_query_search; 169extern char *cgit_query_search;
169extern char *cgit_query_grep; 170extern char *cgit_query_grep;
170extern char *cgit_query_head; 171extern char *cgit_query_head;
171extern char *cgit_query_sha1; 172extern char *cgit_query_sha1;
172extern char *cgit_query_sha2; 173extern char *cgit_query_sha2;
173extern char *cgit_query_path; 174extern char *cgit_query_path;
174extern char *cgit_query_name; 175extern char *cgit_query_name;
175extern int cgit_query_ofs; 176extern int cgit_query_ofs;
176 177
177extern int htmlfd; 178extern int htmlfd;
178 179
179extern int cgit_get_cmd_index(const char *cmd); 180extern int cgit_get_cmd_index(const char *cmd);
180extern struct repoinfo *cgit_get_repoinfo(const char *url); 181extern struct repoinfo *cgit_get_repoinfo(const char *url);
181extern void cgit_global_config_cb(const char *name, const char *value); 182extern void cgit_global_config_cb(const char *name, const char *value);
182extern void cgit_repo_config_cb(const char *name, const char *value); 183extern void cgit_repo_config_cb(const char *name, const char *value);
183extern void cgit_querystring_cb(const char *name, const char *value); 184extern void cgit_querystring_cb(const char *name, const char *value);
184 185
185extern int chk_zero(int result, char *msg); 186extern int chk_zero(int result, char *msg);
186extern int chk_positive(int result, char *msg); 187extern int chk_positive(int result, char *msg);
187extern int chk_non_negative(int result, char *msg); 188extern int chk_non_negative(int result, char *msg);
188 189
189extern int hextoint(char c); 190extern int hextoint(char c);
190extern char *trim_end(const char *str, char c); 191extern char *trim_end(const char *str, char c);
191extern char *strlpart(char *txt, int maxlen); 192extern char *strlpart(char *txt, int maxlen);
192extern char *strrpart(char *txt, int maxlen); 193extern char *strrpart(char *txt, int maxlen);
193 194
194extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 195extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
195extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 196extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
196 int flags, void *cb_data); 197 int flags, void *cb_data);
197 198
198extern void *cgit_free_commitinfo(struct commitinfo *info); 199extern void *cgit_free_commitinfo(struct commitinfo *info);
199 200
200extern int cgit_diff_files(const unsigned char *old_sha1, 201extern int cgit_diff_files(const unsigned char *old_sha1,
201 const unsigned char *new_sha1, 202 const unsigned char *new_sha1,
202 linediff_fn fn); 203 linediff_fn fn);
203 204
204extern void cgit_diff_tree(const unsigned char *old_sha1, 205extern void cgit_diff_tree(const unsigned char *old_sha1,
205 const unsigned char *new_sha1, 206 const unsigned char *new_sha1,
206 filepair_fn fn, const char *prefix); 207 filepair_fn fn, const char *prefix);
207 208
208extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 209extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
209 210
210extern char *fmt(const char *format,...); 211extern char *fmt(const char *format,...);
211 212
212extern void html(const char *txt); 213extern void html(const char *txt);
213extern void htmlf(const char *format,...); 214extern void htmlf(const char *format,...);
214extern void html_txt(char *txt); 215extern void html_txt(char *txt);
215extern void html_ntxt(int len, char *txt); 216extern void html_ntxt(int len, char *txt);
216extern void html_attr(char *txt); 217extern void html_attr(char *txt);
217extern void html_hidden(char *name, char *value); 218extern void html_hidden(char *name, char *value);
218extern void html_option(char *value, char *text, char *selected_value); 219extern void html_option(char *value, char *text, char *selected_value);
219extern void html_link_open(char *url, char *title, char *class); 220extern void html_link_open(char *url, char *title, char *class);
220extern void html_link_close(void); 221extern void html_link_close(void);
221extern void html_filemode(unsigned short mode); 222extern void html_filemode(unsigned short mode);
222extern int html_include(const char *filename); 223extern int html_include(const char *filename);
223 224
224extern int cgit_read_config(const char *filename, configfn fn); 225extern int cgit_read_config(const char *filename, configfn fn);
225extern int cgit_parse_query(char *txt, configfn fn); 226extern int cgit_parse_query(char *txt, configfn fn);
226extern struct commitinfo *cgit_parse_commit(struct commit *commit); 227extern struct commitinfo *cgit_parse_commit(struct commit *commit);
227extern struct taginfo *cgit_parse_tag(struct tag *tag); 228extern struct taginfo *cgit_parse_tag(struct tag *tag);
228extern void cgit_parse_url(const char *url); 229extern void cgit_parse_url(const char *url);
229 230
230extern char *cache_safe_filename(const char *unsafe); 231extern char *cache_safe_filename(const char *unsafe);
231extern int cache_lock(struct cacheitem *item); 232extern int cache_lock(struct cacheitem *item);
232extern int cache_unlock(struct cacheitem *item); 233extern int cache_unlock(struct cacheitem *item);
233extern int cache_cancel_lock(struct cacheitem *item); 234extern int cache_cancel_lock(struct cacheitem *item);
234extern int cache_exist(struct cacheitem *item); 235extern int cache_exist(struct cacheitem *item);
235extern int cache_expired(struct cacheitem *item); 236extern int cache_expired(struct cacheitem *item);
236 237
237extern char *cgit_repourl(const char *reponame); 238extern char *cgit_repourl(const char *reponame);
238extern char *cgit_fileurl(const char *reponame, const char *pagename, 239extern char *cgit_fileurl(const char *reponame, const char *pagename,
239 const char *filename, const char *query); 240 const char *filename, const char *query);
240extern char *cgit_pageurl(const char *reponame, const char *pagename, 241extern char *cgit_pageurl(const char *reponame, const char *pagename,
241 const char *query); 242 const char *query);
242 243
243extern const char *cgit_repobasename(const char *reponame); 244extern const char *cgit_repobasename(const char *reponame);
244 245
245extern void cgit_tree_link(char *name, char *title, char *class, char *head, 246extern void cgit_tree_link(char *name, char *title, char *class, char *head,
246 char *rev, char *path); 247 char *rev, char *path);
247extern void cgit_log_link(char *name, char *title, char *class, char *head, 248extern void cgit_log_link(char *name, char *title, char *class, char *head,
248 char *rev, char *path, int ofs, char *grep, 249 char *rev, char *path, int ofs, char *grep,
249 char *pattern); 250 char *pattern);
250extern void cgit_commit_link(char *name, char *title, char *class, char *head, 251extern void cgit_commit_link(char *name, char *title, char *class, char *head,
251 char *rev); 252 char *rev);
252extern void cgit_refs_link(char *name, char *title, char *class, char *head, 253extern void cgit_refs_link(char *name, char *title, char *class, char *head,
253 char *rev, char *path); 254 char *rev, char *path);
254extern void cgit_snapshot_link(char *name, char *title, char *class, 255extern void cgit_snapshot_link(char *name, char *title, char *class,
255 char *head, char *rev, char *archivename); 256 char *head, char *rev, char *archivename);
256extern void cgit_diff_link(char *name, char *title, char *class, char *head, 257extern void cgit_diff_link(char *name, char *title, char *class, char *head,
257 char *new_rev, char *old_rev, char *path); 258 char *new_rev, char *old_rev, char *path);
258 259
259extern void cgit_object_link(struct object *obj); 260extern void cgit_object_link(struct object *obj);
260 261
261extern void cgit_print_error(char *msg); 262extern void cgit_print_error(char *msg);
262extern void cgit_print_date(time_t secs, char *format); 263extern void cgit_print_date(time_t secs, char *format);
263extern void cgit_print_age(time_t t, time_t max_relative, char *format); 264extern void cgit_print_age(time_t t, time_t max_relative, char *format);
264extern void cgit_print_docstart(char *title, struct cacheitem *item); 265extern void cgit_print_docstart(char *title, struct cacheitem *item);
265extern void cgit_print_docend(); 266extern void cgit_print_docend();
266extern void cgit_print_pageheader(char *title, int show_search); 267extern void cgit_print_pageheader(char *title, int show_search);
267extern void cgit_print_snapshot_start(const char *mimetype, 268extern void cgit_print_snapshot_start(const char *mimetype,
268 const char *filename, 269 const char *filename,
269 struct cacheitem *item); 270 struct cacheitem *item);
270extern void cgit_print_branches(int maxcount); 271extern void cgit_print_branches(int maxcount);
271extern void cgit_print_tags(int maxcount); 272extern void cgit_print_tags(int maxcount);
272 273
273extern void cgit_print_repolist(struct cacheitem *item); 274extern void cgit_print_repolist(struct cacheitem *item);
274extern void cgit_print_summary(); 275extern void cgit_print_summary();
275extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 276extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
276 char *pattern, char *path, int pager); 277 char *pattern, char *path, int pager);
277extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 278extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
278extern void cgit_print_tree(const char *rev, char *path); 279extern void cgit_print_tree(const char *rev, char *path);
279extern void cgit_print_commit(char *hex); 280extern void cgit_print_commit(char *hex);
280extern void cgit_print_refs(); 281extern void cgit_print_refs();
281extern void cgit_print_tag(char *revname); 282extern void cgit_print_tag(char *revname);
282extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); 283extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
283extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 284extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
284 const char *hex, const char *prefix, 285 const char *hex, const char *prefix,
285 const char *filename, int snapshot); 286 const char *filename, int snapshot);
286extern void cgit_print_snapshot_links(const char *repo, const char *head, 287extern void cgit_print_snapshot_links(const char *repo, const char *head,
287 const char *hex, int snapshots); 288 const char *hex, int snapshots);
288extern int cgit_parse_snapshots_mask(const char *str); 289extern int cgit_parse_snapshots_mask(const char *str);
289 290
290#endif /* CGIT_H */ 291#endif /* CGIT_H */
diff --git a/cgitrc b/cgitrc
index 6363c9c..8c616e0 100644
--- a/cgitrc
+++ b/cgitrc
@@ -1,182 +1,187 @@
1## 1##
2## cgitrc: template for /etc/cgitrc 2## cgitrc: template for /etc/cgitrc
3## 3##
4 4
5 5
6## Uncomment and set to 1 to deactivate caching of generated pages. Mostly 6## Uncomment and set to 1 to deactivate caching of generated pages. Mostly
7## usefull for testing. 7## usefull for testing.
8#nocache=0 8#nocache=0
9 9
10 10
11## This variable can be used to override the default value for "robots"
12## meta-tag. If unset, the meta-tag isn't generated.
13#robots=index, nofollow
14
15
11## Set allowed snapshot types by default. Can be overridden per repo 16## Set allowed snapshot types by default. Can be overridden per repo
12# can be any combination of zip/tar.gz/tar.bz2/tar 17# can be any combination of zip/tar.gz/tar.bz2/tar
13#snapshots=0 18#snapshots=0
14 19
15 20
16## Enable/disable extra links to summary/log/tree per repo on index page 21## Enable/disable extra links to summary/log/tree per repo on index page
17#enable-index-links=0 22#enable-index-links=0
18 23
19 24
20## Enable/disable display of 'number of files changed' in log view 25## Enable/disable display of 'number of files changed' in log view
21#enable-log-filecount=0 26#enable-log-filecount=0
22 27
23 28
24## Enable/disable display of 'number of lines changed' in log view 29## Enable/disable display of 'number of lines changed' in log view
25#enable-log-linecount=0 30#enable-log-linecount=0
26 31
27 32
28## Enable/disable display of HEAD shortlog in summary view. Set it to maximum 33## Enable/disable display of HEAD shortlog in summary view. Set it to maximum
29## number of commits that should be displayed 34## number of commits that should be displayed
30#summary-log=0 35#summary-log=0
31 36
32 37
33## Restrict the number of branches printed in summary view. Set to 0 to 38## Restrict the number of branches printed in summary view. Set to 0 to
34## print all branches. 39## print all branches.
35#summary-branches=0 40#summary-branches=0
36 41
37 42
38## Restrict the number of tags printed in summary view. Set to 0 to 43## Restrict the number of tags printed in summary view. Set to 0 to
39## print all tags. 44## print all tags.
40#summary-tags=0 45#summary-tags=0
41 46
42 47
43## The "Idle" column on the repository index page can read a timestamp 48## The "Idle" column on the repository index page can read a timestamp
44## from the specified agefile (if this file cannot be found, the mtime 49## from the specified agefile (if this file cannot be found, the mtime
45## of HEAD is used). 50## of HEAD is used).
46## The cgit repo on hjemli.net uses the the following command in it's 51## The cgit repo on hjemli.net uses the the following command in it's
47## post-receive hook to update the age-file: 52## post-receive hook to update the age-file:
48## git-for-each-ref --format="%(committerdate)" --sort=-committerdate \ 53## git-for-each-ref --format="%(committerdate)" --sort=-committerdate \
49## --count=1 > $GIT_DIR/info/web/last-modifie 54## --count=1 > $GIT_DIR/info/web/last-modifie
50## 55##
51#agefile=info/web/last-modified 56#agefile=info/web/last-modified
52 57
53 58
54## Git detects renames, but with a limit on the number of files to 59## Git detects renames, but with a limit on the number of files to
55## consider. This option can be used to specify another limit (or -1 to 60## consider. This option can be used to specify another limit (or -1 to
56## use the default limit). 61## use the default limit).
57## 62##
58#renamelimit=-1 63#renamelimit=-1
59 64
60 65
61## Specify a root for virtual urls. This makes cgit generate urls like 66## Specify a root for virtual urls. This makes cgit generate urls like
62## 67##
63## http://localhost/git/repo/log/?h=branch 68## http://localhost/git/repo/log/?h=branch
64## 69##
65## instead of 70## instead of
66## 71##
67## http://localhost/cgit/cgit.cgi?url=repo/log&h=branch 72## http://localhost/cgit/cgit.cgi?url=repo/log&h=branch
68## 73##
69## For this to work with apache, a rewrite rule must be added to httpd.conf, 74## For this to work with apache, a rewrite rule must be added to httpd.conf,
70## possibly looking something like this: 75## possibly looking something like this:
71## 76##
72## RewriteRule ^/git/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA] 77## RewriteRule ^/git/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA]
73## 78##
74## For this to work with lighttpd, the rewrite rule should look more like this: 79## For this to work with lighttpd, the rewrite rule should look more like this:
75## 80##
76## url.rewrite = ( 81## url.rewrite = (
77## "^/git/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2" 82## "^/git/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2"
78## ) 83## )
79## 84##
80## This setting is disabled by default. 85## This setting is disabled by default.
81#virtual-root=/git 86#virtual-root=/git
82 87
83 88
84## Set the title printed on the root page 89## Set the title printed on the root page
85#root-title=Git repository browser 90#root-title=Git repository browser
86 91
87 92
88## If specified, the file at this path will be included as HTML in the 93## If specified, the file at this path will be included as HTML in the
89## sidebar on the repository index page 94## sidebar on the repository index page
90#index-info= 95#index-info=
91 96
92 97
93## If specified, the file at this path will be included as HTML above 98## If specified, the file at this path will be included as HTML above
94## the repository index 99## the repository index
95#index-header= 100#index-header=
96 101
97 102
98## Link to css file 103## Link to css file
99#css=/cgit/cgit.css 104#css=/cgit/cgit.css
100 105
101 106
102## Link to logo file 107## Link to logo file
103#logo=/cgit/git-logo.png 108#logo=/cgit/git-logo.png
104 109
105 110
106## Url loaded when clicking the logo 111## Url loaded when clicking the logo
107#logo-link=http://www.kernel.org/pub/software/scm/git/docs/ 112#logo-link=http://www.kernel.org/pub/software/scm/git/docs/
108 113
109 114
110## Url loaded when clicking a submodule link 115## Url loaded when clicking a submodule link
111#module-link=./?repo=%s&page=commit&id=%s 116#module-link=./?repo=%s&page=commit&id=%s
112 117
113 118
114## Number of chars shown of repo description (in repolist view) 119## Number of chars shown of repo description (in repolist view)
115#max-repodesc-length=60 120#max-repodesc-length=60
116 121
117 122
118## Number of chars shown of commit subject message (in log view) 123## Number of chars shown of commit subject message (in log view)
119#max-message-length=60 124#max-message-length=60
120 125
121 126
122## Number of commits per page in log view 127## Number of commits per page in log view
123#max-commit-count=50 128#max-commit-count=50
124 129
125 130
126## Root of cached output 131## Root of cached output
127#cache-root=/var/cache/cgit 132#cache-root=/var/cache/cgit
128 133
129 134
130## Include another config-file 135## Include another config-file
131#include=/var/cgit/repolist 136#include=/var/cgit/repolist
132 137
133## 138##
134## Time-To-Live settings: specifies how long (in minutes) different pages 139## Time-To-Live settings: specifies how long (in minutes) different pages
135## should be cached (0 for instant expiration, -1 for immortal pages) 140## should be cached (0 for instant expiration, -1 for immortal pages)
136## 141##
137 142
138## ttl for root page 143## ttl for root page
139#cache-root-ttl=5 144#cache-root-ttl=5
140 145
141## ttl for repo summary page 146## ttl for repo summary page
142#cache-repo-ttl=5 147#cache-repo-ttl=5
143 148
144## ttl for other dynamic pages 149## ttl for other dynamic pages
145#cache-dynamic-ttl=5 150#cache-dynamic-ttl=5
146 151
147## ttl for static pages (addressed by SHA-1) 152## ttl for static pages (addressed by SHA-1)
148#cache-static-ttl=-1 153#cache-static-ttl=-1
149 154
150 155
151 156
152## Example repository entry. Required values are repo.url and repo.path (each 157## Example repository entry. Required values are repo.url and repo.path (each
153## repository section must start with repo.url). 158## repository section must start with repo.url).
154#repo.url=cgit 159#repo.url=cgit
155#repo.name=cgit 160#repo.name=cgit
156#repo.desc=the caching cgi for git 161#repo.desc=the caching cgi for git
157 #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR 162 #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR
158#repo.owner=Lars Hjemli 163#repo.owner=Lars Hjemli
159 #repo.defbranch=master ## define a default branch 164 #repo.defbranch=master ## define a default branch
160 #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting 165 #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting
161 #repo.enable-log-filecount=0 ## override the default filecount setting 166 #repo.enable-log-filecount=0 ## override the default filecount setting
162 #repo.enable-log-linecount=0 ## override the default linecount setting 167 #repo.enable-log-linecount=0 ## override the default linecount setting
163 #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link 168 #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link
164 #repo.readme=info/web/readme ## specify a file to include on summary page 169 #repo.readme=info/web/readme ## specify a file to include on summary page
165 170
166## Additional repositories grouped under "mirrors" 171## Additional repositories grouped under "mirrors"
167#repo.group=mirrors 172#repo.group=mirrors
168 173
169#repo.url=git 174#repo.url=git
170#repo.path=/pub/git/git 175#repo.path=/pub/git/git
171# 176#
172#repo.url=linux 177#repo.url=linux
173#repo.path=/pub/git/linux 178#repo.path=/pub/git/linux
174 179
175## A group of private repositories (with a working directory) 180## A group of private repositories (with a working directory)
176#repo.group=private 181#repo.group=private
177 182
178#repo.url=larsh/cgit 183#repo.url=larsh/cgit
179#repo.path=/home/larsh/src/cgit/.git 184#repo.path=/home/larsh/src/cgit/.git
180 185
181#repo.url=larsh/git 186#repo.url=larsh/git
182#repo.path=/home/larsh/src/git/.git 187#repo.path=/home/larsh/src/git/.git
diff --git a/shared.c b/shared.c
index 8cb4808..fd8b1e3 100644
--- a/shared.c
+++ b/shared.c
@@ -1,513 +1,516 @@
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_index_info = NULL; 21char *cgit_index_info = NULL;
22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
23char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 23char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
24char *cgit_agefile = "info/web/last-modified"; 24char *cgit_agefile = "info/web/last-modified";
25char *cgit_virtual_root = NULL; 25char *cgit_virtual_root = NULL;
26char *cgit_script_name = CGIT_SCRIPT_NAME; 26char *cgit_script_name = CGIT_SCRIPT_NAME;
27char *cgit_cache_root = CGIT_CACHE_ROOT; 27char *cgit_cache_root = CGIT_CACHE_ROOT;
28char *cgit_repo_group = NULL; 28char *cgit_repo_group = NULL;
29char *cgit_robots = "index, nofollow";
29 30
30int cgit_nocache = 0; 31int cgit_nocache = 0;
31int cgit_snapshots = 0; 32int cgit_snapshots = 0;
32int cgit_enable_index_links = 0; 33int cgit_enable_index_links = 0;
33int cgit_enable_log_filecount = 0; 34int cgit_enable_log_filecount = 0;
34int cgit_enable_log_linecount = 0; 35int cgit_enable_log_linecount = 0;
35int cgit_max_lock_attempts = 5; 36int cgit_max_lock_attempts = 5;
36int cgit_cache_root_ttl = 5; 37int cgit_cache_root_ttl = 5;
37int cgit_cache_repo_ttl = 5; 38int cgit_cache_repo_ttl = 5;
38int cgit_cache_dynamic_ttl = 5; 39int cgit_cache_dynamic_ttl = 5;
39int cgit_cache_static_ttl = -1; 40int cgit_cache_static_ttl = -1;
40int cgit_cache_max_create_time = 5; 41int cgit_cache_max_create_time = 5;
41int cgit_summary_log = 0; 42int cgit_summary_log = 0;
42int cgit_summary_tags = 0; 43int cgit_summary_tags = 0;
43int cgit_summary_branches = 0; 44int cgit_summary_branches = 0;
44int cgit_renamelimit = -1; 45int cgit_renamelimit = -1;
45 46
46int cgit_max_msg_len = 60; 47int cgit_max_msg_len = 60;
47int cgit_max_repodesc_len = 60; 48int cgit_max_repodesc_len = 60;
48int cgit_max_commit_count = 50; 49int cgit_max_commit_count = 50;
49 50
50int cgit_query_has_symref = 0; 51int cgit_query_has_symref = 0;
51int cgit_query_has_sha1 = 0; 52int cgit_query_has_sha1 = 0;
52 53
53char *cgit_querystring = NULL; 54char *cgit_querystring = NULL;
54char *cgit_query_repo = NULL; 55char *cgit_query_repo = NULL;
55char *cgit_query_page = NULL; 56char *cgit_query_page = NULL;
56char *cgit_query_head = NULL; 57char *cgit_query_head = NULL;
57char *cgit_query_search = NULL; 58char *cgit_query_search = NULL;
58char *cgit_query_grep = NULL; 59char *cgit_query_grep = NULL;
59char *cgit_query_sha1 = NULL; 60char *cgit_query_sha1 = NULL;
60char *cgit_query_sha2 = NULL; 61char *cgit_query_sha2 = NULL;
61char *cgit_query_path = NULL; 62char *cgit_query_path = NULL;
62char *cgit_query_name = NULL; 63char *cgit_query_name = NULL;
63int cgit_query_ofs = 0; 64int cgit_query_ofs = 0;
64 65
65int htmlfd = 0; 66int htmlfd = 0;
66 67
67 68
68int cgit_get_cmd_index(const char *cmd) 69int cgit_get_cmd_index(const char *cmd)
69{ 70{
70 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 71 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
71 "snapshot", "tag", "refs", NULL}; 72 "snapshot", "tag", "refs", NULL};
72 int i; 73 int i;
73 74
74 for(i = 0; cmds[i]; i++) 75 for(i = 0; cmds[i]; i++)
75 if (!strcmp(cmd, cmds[i])) 76 if (!strcmp(cmd, cmds[i]))
76 return i + 1; 77 return i + 1;
77 return 0; 78 return 0;
78} 79}
79 80
80int chk_zero(int result, char *msg) 81int chk_zero(int result, char *msg)
81{ 82{
82 if (result != 0) 83 if (result != 0)
83 die("%s: %s", msg, strerror(errno)); 84 die("%s: %s", msg, strerror(errno));
84 return result; 85 return result;
85} 86}
86 87
87int chk_positive(int result, char *msg) 88int chk_positive(int result, char *msg)
88{ 89{
89 if (result <= 0) 90 if (result <= 0)
90 die("%s: %s", msg, strerror(errno)); 91 die("%s: %s", msg, strerror(errno));
91 return result; 92 return result;
92} 93}
93 94
94int chk_non_negative(int result, char *msg) 95int chk_non_negative(int result, char *msg)
95{ 96{
96 if (result < 0) 97 if (result < 0)
97 die("%s: %s",msg, strerror(errno)); 98 die("%s: %s",msg, strerror(errno));
98 return result; 99 return result;
99} 100}
100 101
101struct repoinfo *add_repo(const char *url) 102struct repoinfo *add_repo(const char *url)
102{ 103{
103 struct repoinfo *ret; 104 struct repoinfo *ret;
104 105
105 if (++cgit_repolist.count > cgit_repolist.length) { 106 if (++cgit_repolist.count > cgit_repolist.length) {
106 if (cgit_repolist.length == 0) 107 if (cgit_repolist.length == 0)
107 cgit_repolist.length = 8; 108 cgit_repolist.length = 8;
108 else 109 else
109 cgit_repolist.length *= 2; 110 cgit_repolist.length *= 2;
110 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 111 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
111 cgit_repolist.length * 112 cgit_repolist.length *
112 sizeof(struct repoinfo)); 113 sizeof(struct repoinfo));
113 } 114 }
114 115
115 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 116 ret = &cgit_repolist.repos[cgit_repolist.count-1];
116 ret->url = trim_end(url, '/'); 117 ret->url = trim_end(url, '/');
117 ret->name = ret->url; 118 ret->name = ret->url;
118 ret->path = NULL; 119 ret->path = NULL;
119 ret->desc = NULL; 120 ret->desc = NULL;
120 ret->owner = NULL; 121 ret->owner = NULL;
121 ret->group = cgit_repo_group; 122 ret->group = cgit_repo_group;
122 ret->defbranch = "master"; 123 ret->defbranch = "master";
123 ret->snapshots = cgit_snapshots; 124 ret->snapshots = cgit_snapshots;
124 ret->enable_log_filecount = cgit_enable_log_filecount; 125 ret->enable_log_filecount = cgit_enable_log_filecount;
125 ret->enable_log_linecount = cgit_enable_log_linecount; 126 ret->enable_log_linecount = cgit_enable_log_linecount;
126 ret->module_link = cgit_module_link; 127 ret->module_link = cgit_module_link;
127 ret->readme = NULL; 128 ret->readme = NULL;
128 return ret; 129 return ret;
129} 130}
130 131
131struct repoinfo *cgit_get_repoinfo(const char *url) 132struct repoinfo *cgit_get_repoinfo(const char *url)
132{ 133{
133 int i; 134 int i;
134 struct repoinfo *repo; 135 struct repoinfo *repo;
135 136
136 for (i=0; i<cgit_repolist.count; i++) { 137 for (i=0; i<cgit_repolist.count; i++) {
137 repo = &cgit_repolist.repos[i]; 138 repo = &cgit_repolist.repos[i];
138 if (!strcmp(repo->url, url)) 139 if (!strcmp(repo->url, url))
139 return repo; 140 return repo;
140 } 141 }
141 return NULL; 142 return NULL;
142} 143}
143 144
144void cgit_global_config_cb(const char *name, const char *value) 145void cgit_global_config_cb(const char *name, const char *value)
145{ 146{
146 if (!strcmp(name, "root-title")) 147 if (!strcmp(name, "root-title"))
147 cgit_root_title = xstrdup(value); 148 cgit_root_title = xstrdup(value);
148 else if (!strcmp(name, "css")) 149 else if (!strcmp(name, "css"))
149 cgit_css = xstrdup(value); 150 cgit_css = xstrdup(value);
150 else if (!strcmp(name, "logo")) 151 else if (!strcmp(name, "logo"))
151 cgit_logo = xstrdup(value); 152 cgit_logo = xstrdup(value);
152 else if (!strcmp(name, "index-header")) 153 else if (!strcmp(name, "index-header"))
153 cgit_index_header = xstrdup(value); 154 cgit_index_header = xstrdup(value);
154 else if (!strcmp(name, "index-info")) 155 else if (!strcmp(name, "index-info"))
155 cgit_index_info = xstrdup(value); 156 cgit_index_info = xstrdup(value);
156 else if (!strcmp(name, "logo-link")) 157 else if (!strcmp(name, "logo-link"))
157 cgit_logo_link = xstrdup(value); 158 cgit_logo_link = xstrdup(value);
158 else if (!strcmp(name, "module-link")) 159 else if (!strcmp(name, "module-link"))
159 cgit_module_link = xstrdup(value); 160 cgit_module_link = xstrdup(value);
160 else if (!strcmp(name, "virtual-root")) { 161 else if (!strcmp(name, "virtual-root")) {
161 cgit_virtual_root = trim_end(value, '/'); 162 cgit_virtual_root = trim_end(value, '/');
162 if (!cgit_virtual_root && (!strcmp(value, "/"))) 163 if (!cgit_virtual_root && (!strcmp(value, "/")))
163 cgit_virtual_root = ""; 164 cgit_virtual_root = "";
164 } else if (!strcmp(name, "nocache")) 165 } else if (!strcmp(name, "nocache"))
165 cgit_nocache = atoi(value); 166 cgit_nocache = atoi(value);
166 else if (!strcmp(name, "snapshots")) 167 else if (!strcmp(name, "snapshots"))
167 cgit_snapshots = cgit_parse_snapshots_mask(value); 168 cgit_snapshots = cgit_parse_snapshots_mask(value);
168 else if (!strcmp(name, "enable-index-links")) 169 else if (!strcmp(name, "enable-index-links"))
169 cgit_enable_index_links = atoi(value); 170 cgit_enable_index_links = atoi(value);
170 else if (!strcmp(name, "enable-log-filecount")) 171 else if (!strcmp(name, "enable-log-filecount"))
171 cgit_enable_log_filecount = atoi(value); 172 cgit_enable_log_filecount = atoi(value);
172 else if (!strcmp(name, "enable-log-linecount")) 173 else if (!strcmp(name, "enable-log-linecount"))
173 cgit_enable_log_linecount = atoi(value); 174 cgit_enable_log_linecount = atoi(value);
174 else if (!strcmp(name, "cache-root")) 175 else if (!strcmp(name, "cache-root"))
175 cgit_cache_root = xstrdup(value); 176 cgit_cache_root = xstrdup(value);
176 else if (!strcmp(name, "cache-root-ttl")) 177 else if (!strcmp(name, "cache-root-ttl"))
177 cgit_cache_root_ttl = atoi(value); 178 cgit_cache_root_ttl = atoi(value);
178 else if (!strcmp(name, "cache-repo-ttl")) 179 else if (!strcmp(name, "cache-repo-ttl"))
179 cgit_cache_repo_ttl = atoi(value); 180 cgit_cache_repo_ttl = atoi(value);
180 else if (!strcmp(name, "cache-static-ttl")) 181 else if (!strcmp(name, "cache-static-ttl"))
181 cgit_cache_static_ttl = atoi(value); 182 cgit_cache_static_ttl = atoi(value);
182 else if (!strcmp(name, "cache-dynamic-ttl")) 183 else if (!strcmp(name, "cache-dynamic-ttl"))
183 cgit_cache_dynamic_ttl = atoi(value); 184 cgit_cache_dynamic_ttl = atoi(value);
184 else if (!strcmp(name, "max-message-length")) 185 else if (!strcmp(name, "max-message-length"))
185 cgit_max_msg_len = atoi(value); 186 cgit_max_msg_len = atoi(value);
186 else if (!strcmp(name, "max-repodesc-length")) 187 else if (!strcmp(name, "max-repodesc-length"))
187 cgit_max_repodesc_len = atoi(value); 188 cgit_max_repodesc_len = atoi(value);
188 else if (!strcmp(name, "max-commit-count")) 189 else if (!strcmp(name, "max-commit-count"))
189 cgit_max_commit_count = atoi(value); 190 cgit_max_commit_count = atoi(value);
190 else if (!strcmp(name, "summary-log")) 191 else if (!strcmp(name, "summary-log"))
191 cgit_summary_log = atoi(value); 192 cgit_summary_log = atoi(value);
192 else if (!strcmp(name, "summary-branches")) 193 else if (!strcmp(name, "summary-branches"))
193 cgit_summary_branches = atoi(value); 194 cgit_summary_branches = atoi(value);
194 else if (!strcmp(name, "summary-tags")) 195 else if (!strcmp(name, "summary-tags"))
195 cgit_summary_tags = atoi(value); 196 cgit_summary_tags = atoi(value);
196 else if (!strcmp(name, "agefile")) 197 else if (!strcmp(name, "agefile"))
197 cgit_agefile = xstrdup(value); 198 cgit_agefile = xstrdup(value);
198 else if (!strcmp(name, "renamelimit")) 199 else if (!strcmp(name, "renamelimit"))
199 cgit_renamelimit = atoi(value); 200 cgit_renamelimit = atoi(value);
201 else if (!strcmp(name, "robots"))
202 cgit_robots = xstrdup(value);
200 else if (!strcmp(name, "repo.group")) 203 else if (!strcmp(name, "repo.group"))
201 cgit_repo_group = xstrdup(value); 204 cgit_repo_group = xstrdup(value);
202 else if (!strcmp(name, "repo.url")) 205 else if (!strcmp(name, "repo.url"))
203 cgit_repo = add_repo(value); 206 cgit_repo = add_repo(value);
204 else if (!strcmp(name, "repo.name")) 207 else if (!strcmp(name, "repo.name"))
205 cgit_repo->name = xstrdup(value); 208 cgit_repo->name = xstrdup(value);
206 else if (cgit_repo && !strcmp(name, "repo.path")) 209 else if (cgit_repo && !strcmp(name, "repo.path"))
207 cgit_repo->path = trim_end(value, '/'); 210 cgit_repo->path = trim_end(value, '/');
208 else if (cgit_repo && !strcmp(name, "repo.desc")) 211 else if (cgit_repo && !strcmp(name, "repo.desc"))
209 cgit_repo->desc = xstrdup(value); 212 cgit_repo->desc = xstrdup(value);
210 else if (cgit_repo && !strcmp(name, "repo.owner")) 213 else if (cgit_repo && !strcmp(name, "repo.owner"))
211 cgit_repo->owner = xstrdup(value); 214 cgit_repo->owner = xstrdup(value);
212 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 215 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
213 cgit_repo->defbranch = xstrdup(value); 216 cgit_repo->defbranch = xstrdup(value);
214 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 217 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
215 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 218 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
216 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 219 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
217 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 220 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
218 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 221 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
219 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 222 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
220 else if (cgit_repo && !strcmp(name, "repo.module-link")) 223 else if (cgit_repo && !strcmp(name, "repo.module-link"))
221 cgit_repo->module_link= xstrdup(value); 224 cgit_repo->module_link= xstrdup(value);
222 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { 225 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
223 if (*value == '/') 226 if (*value == '/')
224 cgit_repo->readme = xstrdup(value); 227 cgit_repo->readme = xstrdup(value);
225 else 228 else
226 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); 229 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
227 } else if (!strcmp(name, "include")) 230 } else if (!strcmp(name, "include"))
228 cgit_read_config(value, cgit_global_config_cb); 231 cgit_read_config(value, cgit_global_config_cb);
229} 232}
230 233
231void cgit_querystring_cb(const char *name, const char *value) 234void cgit_querystring_cb(const char *name, const char *value)
232{ 235{
233 if (!strcmp(name,"r")) { 236 if (!strcmp(name,"r")) {
234 cgit_query_repo = xstrdup(value); 237 cgit_query_repo = xstrdup(value);
235 cgit_repo = cgit_get_repoinfo(value); 238 cgit_repo = cgit_get_repoinfo(value);
236 } else if (!strcmp(name, "p")) { 239 } else if (!strcmp(name, "p")) {
237 cgit_query_page = xstrdup(value); 240 cgit_query_page = xstrdup(value);
238 cgit_cmd = cgit_get_cmd_index(value); 241 cgit_cmd = cgit_get_cmd_index(value);
239 } else if (!strcmp(name, "url")) { 242 } else if (!strcmp(name, "url")) {
240 cgit_parse_url(value); 243 cgit_parse_url(value);
241 } else if (!strcmp(name, "qt")) { 244 } else if (!strcmp(name, "qt")) {
242 cgit_query_grep = xstrdup(value); 245 cgit_query_grep = xstrdup(value);
243 } else if (!strcmp(name, "q")) { 246 } else if (!strcmp(name, "q")) {
244 cgit_query_search = xstrdup(value); 247 cgit_query_search = xstrdup(value);
245 } else if (!strcmp(name, "h")) { 248 } else if (!strcmp(name, "h")) {
246 cgit_query_head = xstrdup(value); 249 cgit_query_head = xstrdup(value);
247 cgit_query_has_symref = 1; 250 cgit_query_has_symref = 1;
248 } else if (!strcmp(name, "id")) { 251 } else if (!strcmp(name, "id")) {
249 cgit_query_sha1 = xstrdup(value); 252 cgit_query_sha1 = xstrdup(value);
250 cgit_query_has_sha1 = 1; 253 cgit_query_has_sha1 = 1;
251 } else if (!strcmp(name, "id2")) { 254 } else if (!strcmp(name, "id2")) {
252 cgit_query_sha2 = xstrdup(value); 255 cgit_query_sha2 = xstrdup(value);
253 cgit_query_has_sha1 = 1; 256 cgit_query_has_sha1 = 1;
254 } else if (!strcmp(name, "ofs")) { 257 } else if (!strcmp(name, "ofs")) {
255 cgit_query_ofs = atoi(value); 258 cgit_query_ofs = atoi(value);
256 } else if (!strcmp(name, "path")) { 259 } else if (!strcmp(name, "path")) {
257 cgit_query_path = trim_end(value, '/'); 260 cgit_query_path = trim_end(value, '/');
258 } else if (!strcmp(name, "name")) { 261 } else if (!strcmp(name, "name")) {
259 cgit_query_name = xstrdup(value); 262 cgit_query_name = xstrdup(value);
260 } 263 }
261} 264}
262 265
263void *cgit_free_commitinfo(struct commitinfo *info) 266void *cgit_free_commitinfo(struct commitinfo *info)
264{ 267{
265 free(info->author); 268 free(info->author);
266 free(info->author_email); 269 free(info->author_email);
267 free(info->committer); 270 free(info->committer);
268 free(info->committer_email); 271 free(info->committer_email);
269 free(info->subject); 272 free(info->subject);
270 free(info->msg); 273 free(info->msg);
271 free(info->msg_encoding); 274 free(info->msg_encoding);
272 free(info); 275 free(info);
273 return NULL; 276 return NULL;
274} 277}
275 278
276int hextoint(char c) 279int hextoint(char c)
277{ 280{
278 if (c >= 'a' && c <= 'f') 281 if (c >= 'a' && c <= 'f')
279 return 10 + c - 'a'; 282 return 10 + c - 'a';
280 else if (c >= 'A' && c <= 'F') 283 else if (c >= 'A' && c <= 'F')
281 return 10 + c - 'A'; 284 return 10 + c - 'A';
282 else if (c >= '0' && c <= '9') 285 else if (c >= '0' && c <= '9')
283 return c - '0'; 286 return c - '0';
284 else 287 else
285 return -1; 288 return -1;
286} 289}
287 290
288char *trim_end(const char *str, char c) 291char *trim_end(const char *str, char c)
289{ 292{
290 int len; 293 int len;
291 char *s, *t; 294 char *s, *t;
292 295
293 if (str == NULL) 296 if (str == NULL)
294 return NULL; 297 return NULL;
295 t = (char *)str; 298 t = (char *)str;
296 len = strlen(t); 299 len = strlen(t);
297 while(len > 0 && t[len - 1] == c) 300 while(len > 0 && t[len - 1] == c)
298 len--; 301 len--;
299 302
300 if (len == 0) 303 if (len == 0)
301 return NULL; 304 return NULL;
302 305
303 c = t[len]; 306 c = t[len];
304 t[len] = '\0'; 307 t[len] = '\0';
305 s = xstrdup(t); 308 s = xstrdup(t);
306 t[len] = c; 309 t[len] = c;
307 return s; 310 return s;
308} 311}
309 312
310char *strlpart(char *txt, int maxlen) 313char *strlpart(char *txt, int maxlen)
311{ 314{
312 char *result; 315 char *result;
313 316
314 if (!txt) 317 if (!txt)
315 return txt; 318 return txt;
316 319
317 if (strlen(txt) <= maxlen) 320 if (strlen(txt) <= maxlen)
318 return txt; 321 return txt;
319 result = xmalloc(maxlen + 1); 322 result = xmalloc(maxlen + 1);
320 memcpy(result, txt, maxlen - 3); 323 memcpy(result, txt, maxlen - 3);
321 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; 324 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
322 result[maxlen] = '\0'; 325 result[maxlen] = '\0';
323 return result; 326 return result;
324} 327}
325 328
326char *strrpart(char *txt, int maxlen) 329char *strrpart(char *txt, int maxlen)
327{ 330{
328 char *result; 331 char *result;
329 332
330 if (!txt) 333 if (!txt)
331 return txt; 334 return txt;
332 335
333 if (strlen(txt) <= maxlen) 336 if (strlen(txt) <= maxlen)
334 return txt; 337 return txt;
335 result = xmalloc(maxlen + 1); 338 result = xmalloc(maxlen + 1);
336 memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); 339 memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
337 result[0] = result[1] = result[2] = '.'; 340 result[0] = result[1] = result[2] = '.';
338 return result; 341 return result;
339} 342}
340 343
341void cgit_add_ref(struct reflist *list, struct refinfo *ref) 344void cgit_add_ref(struct reflist *list, struct refinfo *ref)
342{ 345{
343 size_t size; 346 size_t size;
344 347
345 if (list->count >= list->alloc) { 348 if (list->count >= list->alloc) {
346 list->alloc += (list->alloc ? list->alloc : 4); 349 list->alloc += (list->alloc ? list->alloc : 4);
347 size = list->alloc * sizeof(struct refinfo *); 350 size = list->alloc * sizeof(struct refinfo *);
348 list->refs = xrealloc(list->refs, size); 351 list->refs = xrealloc(list->refs, size);
349 } 352 }
350 list->refs[list->count++] = ref; 353 list->refs[list->count++] = ref;
351} 354}
352 355
353struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) 356struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
354{ 357{
355 struct refinfo *ref; 358 struct refinfo *ref;
356 359
357 ref = xmalloc(sizeof (struct refinfo)); 360 ref = xmalloc(sizeof (struct refinfo));
358 ref->refname = xstrdup(refname); 361 ref->refname = xstrdup(refname);
359 ref->object = parse_object(sha1); 362 ref->object = parse_object(sha1);
360 switch (ref->object->type) { 363 switch (ref->object->type) {
361 case OBJ_TAG: 364 case OBJ_TAG:
362 ref->tag = cgit_parse_tag((struct tag *)ref->object); 365 ref->tag = cgit_parse_tag((struct tag *)ref->object);
363 break; 366 break;
364 case OBJ_COMMIT: 367 case OBJ_COMMIT:
365 ref->commit = cgit_parse_commit((struct commit *)ref->object); 368 ref->commit = cgit_parse_commit((struct commit *)ref->object);
366 break; 369 break;
367 } 370 }
368 return ref; 371 return ref;
369} 372}
370 373
371int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, 374int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
372 void *cb_data) 375 void *cb_data)
373{ 376{
374 struct reflist *list = (struct reflist *)cb_data; 377 struct reflist *list = (struct reflist *)cb_data;
375 struct refinfo *info = cgit_mk_refinfo(refname, sha1); 378 struct refinfo *info = cgit_mk_refinfo(refname, sha1);
376 379
377 if (info) 380 if (info)
378 cgit_add_ref(list, info); 381 cgit_add_ref(list, info);
379 return 0; 382 return 0;
380} 383}
381 384
382void cgit_diff_tree_cb(struct diff_queue_struct *q, 385void cgit_diff_tree_cb(struct diff_queue_struct *q,
383 struct diff_options *options, void *data) 386 struct diff_options *options, void *data)
384{ 387{
385 int i; 388 int i;
386 389
387 for (i = 0; i < q->nr; i++) { 390 for (i = 0; i < q->nr; i++) {
388 if (q->queue[i]->status == 'U') 391 if (q->queue[i]->status == 'U')
389 continue; 392 continue;
390 ((filepair_fn)data)(q->queue[i]); 393 ((filepair_fn)data)(q->queue[i]);
391 } 394 }
392} 395}
393 396
394static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 397static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
395{ 398{
396 enum object_type type; 399 enum object_type type;
397 400
398 if (is_null_sha1(sha1)) { 401 if (is_null_sha1(sha1)) {
399 file->ptr = (char *)""; 402 file->ptr = (char *)"";
400 file->size = 0; 403 file->size = 0;
401 } else { 404 } else {
402 file->ptr = read_sha1_file(sha1, &type, 405 file->ptr = read_sha1_file(sha1, &type,
403 (unsigned long *)&file->size); 406 (unsigned long *)&file->size);
404 } 407 }
405 return 1; 408 return 1;
406} 409}
407 410
408/* 411/*
409 * Receive diff-buffers from xdiff and concatenate them as 412 * Receive diff-buffers from xdiff and concatenate them as
410 * needed across multiple callbacks. 413 * needed across multiple callbacks.
411 * 414 *
412 * This is basically a copy of xdiff-interface.c/xdiff_outf(), 415 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
413 * ripped from git and modified to use globals instead of 416 * ripped from git and modified to use globals instead of
414 * a special callback-struct. 417 * a special callback-struct.
415 */ 418 */
416char *diffbuf = NULL; 419char *diffbuf = NULL;
417int buflen = 0; 420int buflen = 0;
418 421
419int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 422int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
420{ 423{
421 int i; 424 int i;
422 425
423 for (i = 0; i < nbuf; i++) { 426 for (i = 0; i < nbuf; i++) {
424 if (mb[i].ptr[mb[i].size-1] != '\n') { 427 if (mb[i].ptr[mb[i].size-1] != '\n') {
425 /* Incomplete line */ 428 /* Incomplete line */
426 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 429 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
427 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 430 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
428 buflen += mb[i].size; 431 buflen += mb[i].size;
429 continue; 432 continue;
430 } 433 }
431 434
432 /* we have a complete line */ 435 /* we have a complete line */
433 if (!diffbuf) { 436 if (!diffbuf) {
434 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 437 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
435 continue; 438 continue;
436 } 439 }
437 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 440 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
438 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 441 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
439 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 442 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
440 free(diffbuf); 443 free(diffbuf);
441 diffbuf = NULL; 444 diffbuf = NULL;
442 buflen = 0; 445 buflen = 0;
443 } 446 }
444 if (diffbuf) { 447 if (diffbuf) {
445 ((linediff_fn)priv)(diffbuf, buflen); 448 ((linediff_fn)priv)(diffbuf, buflen);
446 free(diffbuf); 449 free(diffbuf);
447 diffbuf = NULL; 450 diffbuf = NULL;
448 buflen = 0; 451 buflen = 0;
449 } 452 }
450 return 0; 453 return 0;
451} 454}
452 455
453int cgit_diff_files(const unsigned char *old_sha1, 456int cgit_diff_files(const unsigned char *old_sha1,
454 const unsigned char *new_sha1, 457 const unsigned char *new_sha1,
455 linediff_fn fn) 458 linediff_fn fn)
456{ 459{
457 mmfile_t file1, file2; 460 mmfile_t file1, file2;
458 xpparam_t diff_params; 461 xpparam_t diff_params;
459 xdemitconf_t emit_params; 462 xdemitconf_t emit_params;
460 xdemitcb_t emit_cb; 463 xdemitcb_t emit_cb;
461 464
462 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 465 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
463 return 1; 466 return 1;
464 467
465 diff_params.flags = XDF_NEED_MINIMAL; 468 diff_params.flags = XDF_NEED_MINIMAL;
466 emit_params.ctxlen = 3; 469 emit_params.ctxlen = 3;
467 emit_params.flags = XDL_EMIT_FUNCNAMES; 470 emit_params.flags = XDL_EMIT_FUNCNAMES;
468 emit_params.find_func = NULL; 471 emit_params.find_func = NULL;
469 emit_cb.outf = filediff_cb; 472 emit_cb.outf = filediff_cb;
470 emit_cb.priv = fn; 473 emit_cb.priv = fn;
471 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 474 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
472 return 0; 475 return 0;
473} 476}
474 477
475void cgit_diff_tree(const unsigned char *old_sha1, 478void cgit_diff_tree(const unsigned char *old_sha1,
476 const unsigned char *new_sha1, 479 const unsigned char *new_sha1,
477 filepair_fn fn, const char *prefix) 480 filepair_fn fn, const char *prefix)
478{ 481{
479 struct diff_options opt; 482 struct diff_options opt;
480 int ret; 483 int ret;
481 int prefixlen; 484 int prefixlen;
482 485
483 diff_setup(&opt); 486 diff_setup(&opt);
484 opt.output_format = DIFF_FORMAT_CALLBACK; 487 opt.output_format = DIFF_FORMAT_CALLBACK;
485 opt.detect_rename = 1; 488 opt.detect_rename = 1;
486 opt.rename_limit = cgit_renamelimit; 489 opt.rename_limit = cgit_renamelimit;
487 opt.recursive = 1; 490 opt.recursive = 1;
488 opt.format_callback = cgit_diff_tree_cb; 491 opt.format_callback = cgit_diff_tree_cb;
489 opt.format_callback_data = fn; 492 opt.format_callback_data = fn;
490 if (prefix) { 493 if (prefix) {
491 opt.nr_paths = 1; 494 opt.nr_paths = 1;
492 opt.paths = &prefix; 495 opt.paths = &prefix;
493 prefixlen = strlen(prefix); 496 prefixlen = strlen(prefix);
494 opt.pathlens = &prefixlen; 497 opt.pathlens = &prefixlen;
495 } 498 }
496 diff_setup_done(&opt); 499 diff_setup_done(&opt);
497 500
498 if (old_sha1 && !is_null_sha1(old_sha1)) 501 if (old_sha1 && !is_null_sha1(old_sha1))
499 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 502 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
500 else 503 else
501 ret = diff_root_tree_sha1(new_sha1, "", &opt); 504 ret = diff_root_tree_sha1(new_sha1, "", &opt);
502 diffcore_std(&opt); 505 diffcore_std(&opt);
503 diff_flush(&opt); 506 diff_flush(&opt);
504} 507}
505 508
506void cgit_diff_commit(struct commit *commit, filepair_fn fn) 509void cgit_diff_commit(struct commit *commit, filepair_fn fn)
507{ 510{
508 unsigned char *old_sha1 = NULL; 511 unsigned char *old_sha1 = NULL;
509 512
510 if (commit->parents) 513 if (commit->parents)
511 old_sha1 = commit->parents->item->object.sha1; 514 old_sha1 = commit->parents->item->object.sha1;
512 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 515 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
513} 516}
diff --git a/ui-shared.c b/ui-shared.c
index 5192800..2f771da 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,537 +1,539 @@
1/* ui-shared.c: common web output functions 1/* ui-shared.c: common web output 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
11const char cgit_doctype[] = 11const char cgit_doctype[] =
12"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 12"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
13" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 13" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
14 14
15static char *http_date(time_t t) 15static char *http_date(time_t t)
16{ 16{
17 static char day[][4] = 17 static char day[][4] =
18 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 18 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
19 static char month[][4] = 19 static char month[][4] =
20 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 20 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
21 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 21 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
22 struct tm *tm = gmtime(&t); 22 struct tm *tm = gmtime(&t);
23 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 23 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
24 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 24 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
25 tm->tm_hour, tm->tm_min, tm->tm_sec); 25 tm->tm_hour, tm->tm_min, tm->tm_sec);
26} 26}
27 27
28static long ttl_seconds(long ttl) 28static long ttl_seconds(long ttl)
29{ 29{
30 if (ttl<0) 30 if (ttl<0)
31 return 60 * 60 * 24 * 365; 31 return 60 * 60 * 24 * 365;
32 else 32 else
33 return ttl * 60; 33 return ttl * 60;
34} 34}
35 35
36void cgit_print_error(char *msg) 36void cgit_print_error(char *msg)
37{ 37{
38 html("<div class='error'>"); 38 html("<div class='error'>");
39 html_txt(msg); 39 html_txt(msg);
40 html("</div>\n"); 40 html("</div>\n");
41} 41}
42 42
43char *cgit_rooturl() 43char *cgit_rooturl()
44{ 44{
45 if (cgit_virtual_root) 45 if (cgit_virtual_root)
46 return fmt("%s/", cgit_virtual_root); 46 return fmt("%s/", cgit_virtual_root);
47 else 47 else
48 return cgit_script_name; 48 return cgit_script_name;
49} 49}
50 50
51char *cgit_repourl(const char *reponame) 51char *cgit_repourl(const char *reponame)
52{ 52{
53 if (cgit_virtual_root) { 53 if (cgit_virtual_root) {
54 return fmt("%s/%s/", cgit_virtual_root, reponame); 54 return fmt("%s/%s/", cgit_virtual_root, reponame);
55 } else { 55 } else {
56 return fmt("?r=%s", reponame); 56 return fmt("?r=%s", reponame);
57 } 57 }
58} 58}
59 59
60char *cgit_fileurl(const char *reponame, const char *pagename, 60char *cgit_fileurl(const char *reponame, const char *pagename,
61 const char *filename, const char *query) 61 const char *filename, const char *query)
62{ 62{
63 char *tmp; 63 char *tmp;
64 char *delim; 64 char *delim;
65 65
66 if (cgit_virtual_root) { 66 if (cgit_virtual_root) {
67 tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame, 67 tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
68 pagename, (filename ? filename:"")); 68 pagename, (filename ? filename:""));
69 delim = "?"; 69 delim = "?";
70 } else { 70 } else {
71 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 71 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
72 (filename ? filename : "")); 72 (filename ? filename : ""));
73 delim = "&"; 73 delim = "&";
74 } 74 }
75 if (query) 75 if (query)
76 tmp = fmt("%s%s%s", tmp, delim, query); 76 tmp = fmt("%s%s%s", tmp, delim, query);
77 return tmp; 77 return tmp;
78} 78}
79 79
80char *cgit_pageurl(const char *reponame, const char *pagename, 80char *cgit_pageurl(const char *reponame, const char *pagename,
81 const char *query) 81 const char *query)
82{ 82{
83 return cgit_fileurl(reponame,pagename,0,query); 83 return cgit_fileurl(reponame,pagename,0,query);
84} 84}
85 85
86const char *cgit_repobasename(const char *reponame) 86const char *cgit_repobasename(const char *reponame)
87{ 87{
88 /* I assume we don't need to store more than one repo basename */ 88 /* I assume we don't need to store more than one repo basename */
89 static char rvbuf[1024]; 89 static char rvbuf[1024];
90 int p; 90 int p;
91 const char *rv; 91 const char *rv;
92 strncpy(rvbuf,reponame,sizeof(rvbuf)); 92 strncpy(rvbuf,reponame,sizeof(rvbuf));
93 if(rvbuf[sizeof(rvbuf)-1]) 93 if(rvbuf[sizeof(rvbuf)-1])
94 die("cgit_repobasename: truncated repository name '%s'", reponame); 94 die("cgit_repobasename: truncated repository name '%s'", reponame);
95 p = strlen(rvbuf)-1; 95 p = strlen(rvbuf)-1;
96 /* strip trailing slashes */ 96 /* strip trailing slashes */
97 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 97 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
98 /* strip trailing .git */ 98 /* strip trailing .git */
99 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 99 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
100 p -= 3; rvbuf[p--] = 0; 100 p -= 3; rvbuf[p--] = 0;
101 } 101 }
102 /* strip more trailing slashes if any */ 102 /* strip more trailing slashes if any */
103 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 103 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
104 /* find last slash in the remaining string */ 104 /* find last slash in the remaining string */
105 rv = strrchr(rvbuf,'/'); 105 rv = strrchr(rvbuf,'/');
106 if(rv) 106 if(rv)
107 return ++rv; 107 return ++rv;
108 return rvbuf; 108 return rvbuf;
109} 109}
110 110
111char *cgit_currurl() 111char *cgit_currurl()
112{ 112{
113 if (!cgit_virtual_root) 113 if (!cgit_virtual_root)
114 return cgit_script_name; 114 return cgit_script_name;
115 else if (cgit_query_page) 115 else if (cgit_query_page)
116 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); 116 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
117 else if (cgit_query_repo) 117 else if (cgit_query_repo)
118 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); 118 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
119 else 119 else
120 return fmt("%s/", cgit_virtual_root); 120 return fmt("%s/", cgit_virtual_root);
121} 121}
122 122
123static char *repolink(char *title, char *class, char *page, char *head, 123static char *repolink(char *title, char *class, char *page, char *head,
124 char *path) 124 char *path)
125{ 125{
126 char *delim = "?"; 126 char *delim = "?";
127 127
128 html("<a"); 128 html("<a");
129 if (title) { 129 if (title) {
130 html(" title='"); 130 html(" title='");
131 html_attr(title); 131 html_attr(title);
132 html("'"); 132 html("'");
133 } 133 }
134 if (class) { 134 if (class) {
135 html(" class='"); 135 html(" class='");
136 html_attr(class); 136 html_attr(class);
137 html("'"); 137 html("'");
138 } 138 }
139 html(" href='"); 139 html(" href='");
140 if (cgit_virtual_root) { 140 if (cgit_virtual_root) {
141 html_attr(cgit_virtual_root); 141 html_attr(cgit_virtual_root);
142 if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') 142 if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
143 html("/"); 143 html("/");
144 html_attr(cgit_repo->url); 144 html_attr(cgit_repo->url);
145 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') 145 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
146 html("/"); 146 html("/");
147 if (page) { 147 if (page) {
148 html(page); 148 html(page);
149 html("/"); 149 html("/");
150 if (path) 150 if (path)
151 html_attr(path); 151 html_attr(path);
152 } 152 }
153 } else { 153 } else {
154 html(cgit_script_name); 154 html(cgit_script_name);
155 html("?url="); 155 html("?url=");
156 html_attr(cgit_repo->url); 156 html_attr(cgit_repo->url);
157 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') 157 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
158 html("/"); 158 html("/");
159 if (page) { 159 if (page) {
160 html(page); 160 html(page);
161 html("/"); 161 html("/");
162 if (path) 162 if (path)
163 html_attr(path); 163 html_attr(path);
164 } 164 }
165 delim = "&amp;"; 165 delim = "&amp;";
166 } 166 }
167 if (head && strcmp(head, cgit_repo->defbranch)) { 167 if (head && strcmp(head, cgit_repo->defbranch)) {
168 html(delim); 168 html(delim);
169 html("h="); 169 html("h=");
170 html_attr(head); 170 html_attr(head);
171 delim = "&amp;"; 171 delim = "&amp;";
172 } 172 }
173 return fmt("%s", delim); 173 return fmt("%s", delim);
174} 174}
175 175
176static void reporevlink(char *page, char *name, char *title, char *class, 176static void reporevlink(char *page, char *name, char *title, char *class,
177 char *head, char *rev, char *path) 177 char *head, char *rev, char *path)
178{ 178{
179 char *delim; 179 char *delim;
180 180
181 delim = repolink(title, class, page, head, path); 181 delim = repolink(title, class, page, head, path);
182 if (rev && strcmp(rev, cgit_query_head)) { 182 if (rev && strcmp(rev, cgit_query_head)) {
183 html(delim); 183 html(delim);
184 html("id="); 184 html("id=");
185 html_attr(rev); 185 html_attr(rev);
186 } 186 }
187 html("'>"); 187 html("'>");
188 html_txt(name); 188 html_txt(name);
189 html("</a>"); 189 html("</a>");
190} 190}
191 191
192void cgit_tree_link(char *name, char *title, char *class, char *head, 192void cgit_tree_link(char *name, char *title, char *class, char *head,
193 char *rev, char *path) 193 char *rev, char *path)
194{ 194{
195 reporevlink("tree", name, title, class, head, rev, path); 195 reporevlink("tree", name, title, class, head, rev, path);
196} 196}
197 197
198void cgit_log_link(char *name, char *title, char *class, char *head, 198void cgit_log_link(char *name, char *title, char *class, char *head,
199 char *rev, char *path, int ofs, char *grep, char *pattern) 199 char *rev, char *path, int ofs, char *grep, char *pattern)
200{ 200{
201 char *delim; 201 char *delim;
202 202
203 delim = repolink(title, class, "log", head, path); 203 delim = repolink(title, class, "log", head, path);
204 if (rev && strcmp(rev, cgit_query_head)) { 204 if (rev && strcmp(rev, cgit_query_head)) {
205 html(delim); 205 html(delim);
206 html("id="); 206 html("id=");
207 html_attr(rev); 207 html_attr(rev);
208 delim = "&"; 208 delim = "&";
209 } 209 }
210 if (grep && pattern) { 210 if (grep && pattern) {
211 html(delim); 211 html(delim);
212 html("qt="); 212 html("qt=");
213 html_attr(grep); 213 html_attr(grep);
214 delim = "&"; 214 delim = "&";
215 html(delim); 215 html(delim);
216 html("q="); 216 html("q=");
217 html_attr(pattern); 217 html_attr(pattern);
218 } 218 }
219 if (ofs > 0) { 219 if (ofs > 0) {
220 html(delim); 220 html(delim);
221 html("ofs="); 221 html("ofs=");
222 htmlf("%d", ofs); 222 htmlf("%d", ofs);
223 } 223 }
224 html("'>"); 224 html("'>");
225 html_txt(name); 225 html_txt(name);
226 html("</a>"); 226 html("</a>");
227} 227}
228 228
229void cgit_commit_link(char *name, char *title, char *class, char *head, 229void cgit_commit_link(char *name, char *title, char *class, char *head,
230 char *rev) 230 char *rev)
231{ 231{
232 if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { 232 if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
233 name[cgit_max_msg_len] = '\0'; 233 name[cgit_max_msg_len] = '\0';
234 name[cgit_max_msg_len - 1] = '.'; 234 name[cgit_max_msg_len - 1] = '.';
235 name[cgit_max_msg_len - 2] = '.'; 235 name[cgit_max_msg_len - 2] = '.';
236 name[cgit_max_msg_len - 3] = '.'; 236 name[cgit_max_msg_len - 3] = '.';
237 } 237 }
238 reporevlink("commit", name, title, class, head, rev, NULL); 238 reporevlink("commit", name, title, class, head, rev, NULL);
239} 239}
240 240
241void cgit_refs_link(char *name, char *title, char *class, char *head, 241void cgit_refs_link(char *name, char *title, char *class, char *head,
242 char *rev, char *path) 242 char *rev, char *path)
243{ 243{
244 reporevlink("refs", name, title, class, head, rev, path); 244 reporevlink("refs", name, title, class, head, rev, path);
245} 245}
246 246
247void cgit_snapshot_link(char *name, char *title, char *class, char *head, 247void cgit_snapshot_link(char *name, char *title, char *class, char *head,
248 char *rev, char *archivename) 248 char *rev, char *archivename)
249{ 249{
250 reporevlink("snapshot", name, title, class, head, rev, archivename); 250 reporevlink("snapshot", name, title, class, head, rev, archivename);
251} 251}
252 252
253void cgit_diff_link(char *name, char *title, char *class, char *head, 253void cgit_diff_link(char *name, char *title, char *class, char *head,
254 char *new_rev, char *old_rev, char *path) 254 char *new_rev, char *old_rev, char *path)
255{ 255{
256 char *delim; 256 char *delim;
257 257
258 delim = repolink(title, class, "diff", head, path); 258 delim = repolink(title, class, "diff", head, path);
259 if (new_rev && strcmp(new_rev, cgit_query_head)) { 259 if (new_rev && strcmp(new_rev, cgit_query_head)) {
260 html(delim); 260 html(delim);
261 html("id="); 261 html("id=");
262 html_attr(new_rev); 262 html_attr(new_rev);
263 delim = "&amp;"; 263 delim = "&amp;";
264 } 264 }
265 if (old_rev) { 265 if (old_rev) {
266 html(delim); 266 html(delim);
267 html("id2="); 267 html("id2=");
268 html_attr(old_rev); 268 html_attr(old_rev);
269 } 269 }
270 html("'>"); 270 html("'>");
271 html_txt(name); 271 html_txt(name);
272 html("</a>"); 272 html("</a>");
273} 273}
274 274
275void cgit_object_link(struct object *obj) 275void cgit_object_link(struct object *obj)
276{ 276{
277 char *page, *arg, *url; 277 char *page, *arg, *url;
278 278
279 if (obj->type == OBJ_COMMIT) { 279 if (obj->type == OBJ_COMMIT) {
280 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, 280 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
281 cgit_query_head, sha1_to_hex(obj->sha1)); 281 cgit_query_head, sha1_to_hex(obj->sha1));
282 return; 282 return;
283 } else if (obj->type == OBJ_TREE) { 283 } else if (obj->type == OBJ_TREE) {
284 page = "tree"; 284 page = "tree";
285 arg = "id"; 285 arg = "id";
286 } else if (obj->type == OBJ_TAG) { 286 } else if (obj->type == OBJ_TAG) {
287 page = "tag"; 287 page = "tag";
288 arg = "id"; 288 arg = "id";
289 } else { 289 } else {
290 page = "blob"; 290 page = "blob";
291 arg = "id"; 291 arg = "id";
292 } 292 }
293 293
294 url = cgit_pageurl(cgit_query_repo, page, 294 url = cgit_pageurl(cgit_query_repo, page,
295 fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); 295 fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
296 html_link_open(url, NULL, NULL); 296 html_link_open(url, NULL, NULL);
297 htmlf("%s %s", typename(obj->type), 297 htmlf("%s %s", typename(obj->type),
298 sha1_to_hex(obj->sha1)); 298 sha1_to_hex(obj->sha1));
299 html_link_close(); 299 html_link_close();
300} 300}
301 301
302void cgit_print_date(time_t secs, char *format) 302void cgit_print_date(time_t secs, char *format)
303{ 303{
304 char buf[64]; 304 char buf[64];
305 struct tm *time; 305 struct tm *time;
306 306
307 time = gmtime(&secs); 307 time = gmtime(&secs);
308 strftime(buf, sizeof(buf)-1, format, time); 308 strftime(buf, sizeof(buf)-1, format, time);
309 html_txt(buf); 309 html_txt(buf);
310} 310}
311 311
312void cgit_print_age(time_t t, time_t max_relative, char *format) 312void cgit_print_age(time_t t, time_t max_relative, char *format)
313{ 313{
314 time_t now, secs; 314 time_t now, secs;
315 315
316 time(&now); 316 time(&now);
317 secs = now - t; 317 secs = now - t;
318 318
319 if (secs > max_relative && max_relative >= 0) { 319 if (secs > max_relative && max_relative >= 0) {
320 cgit_print_date(t, format); 320 cgit_print_date(t, format);
321 return; 321 return;
322 } 322 }
323 323
324 if (secs < TM_HOUR * 2) { 324 if (secs < TM_HOUR * 2) {
325 htmlf("<span class='age-mins'>%.0f min.</span>", 325 htmlf("<span class='age-mins'>%.0f min.</span>",
326 secs * 1.0 / TM_MIN); 326 secs * 1.0 / TM_MIN);
327 return; 327 return;
328 } 328 }
329 if (secs < TM_DAY * 2) { 329 if (secs < TM_DAY * 2) {
330 htmlf("<span class='age-hours'>%.0f hours</span>", 330 htmlf("<span class='age-hours'>%.0f hours</span>",
331 secs * 1.0 / TM_HOUR); 331 secs * 1.0 / TM_HOUR);
332 return; 332 return;
333 } 333 }
334 if (secs < TM_WEEK * 2) { 334 if (secs < TM_WEEK * 2) {
335 htmlf("<span class='age-days'>%.0f days</span>", 335 htmlf("<span class='age-days'>%.0f days</span>",
336 secs * 1.0 / TM_DAY); 336 secs * 1.0 / TM_DAY);
337 return; 337 return;
338 } 338 }
339 if (secs < TM_MONTH * 2) { 339 if (secs < TM_MONTH * 2) {
340 htmlf("<span class='age-weeks'>%.0f weeks</span>", 340 htmlf("<span class='age-weeks'>%.0f weeks</span>",
341 secs * 1.0 / TM_WEEK); 341 secs * 1.0 / TM_WEEK);
342 return; 342 return;
343 } 343 }
344 if (secs < TM_YEAR * 2) { 344 if (secs < TM_YEAR * 2) {
345 htmlf("<span class='age-months'>%.0f months</span>", 345 htmlf("<span class='age-months'>%.0f months</span>",
346 secs * 1.0 / TM_MONTH); 346 secs * 1.0 / TM_MONTH);
347 return; 347 return;
348 } 348 }
349 htmlf("<span class='age-years'>%.0f years</span>", 349 htmlf("<span class='age-years'>%.0f years</span>",
350 secs * 1.0 / TM_YEAR); 350 secs * 1.0 / TM_YEAR);
351} 351}
352 352
353void cgit_print_docstart(char *title, struct cacheitem *item) 353void cgit_print_docstart(char *title, struct cacheitem *item)
354{ 354{
355 html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); 355 html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
356 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 356 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
357 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 357 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
358 ttl_seconds(item->ttl))); 358 ttl_seconds(item->ttl)));
359 html("\n"); 359 html("\n");
360 html(cgit_doctype); 360 html(cgit_doctype);
361 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 361 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
362 html("<head>\n"); 362 html("<head>\n");
363 html("<title>"); 363 html("<title>");
364 html_txt(title); 364 html_txt(title);
365 html("</title>\n"); 365 html("</title>\n");
366 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 366 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
367 if (cgit_robots && *cgit_robots)
368 htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
367 html("<link rel='stylesheet' type='text/css' href='"); 369 html("<link rel='stylesheet' type='text/css' href='");
368 html_attr(cgit_css); 370 html_attr(cgit_css);
369 html("'/>\n"); 371 html("'/>\n");
370 html("</head>\n"); 372 html("</head>\n");
371 html("<body>\n"); 373 html("<body>\n");
372} 374}
373 375
374void cgit_print_docend() 376void cgit_print_docend()
375{ 377{
376 html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); 378 html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
377} 379}
378 380
379int print_branch_option(const char *refname, const unsigned char *sha1, 381int print_branch_option(const char *refname, const unsigned char *sha1,
380 int flags, void *cb_data) 382 int flags, void *cb_data)
381{ 383{
382 char *name = (char *)refname; 384 char *name = (char *)refname;
383 html_option(name, name, cgit_query_head); 385 html_option(name, name, cgit_query_head);
384 return 0; 386 return 0;
385} 387}
386 388
387int print_archive_ref(const char *refname, const unsigned char *sha1, 389int print_archive_ref(const char *refname, const unsigned char *sha1,
388 int flags, void *cb_data) 390 int flags, void *cb_data)
389{ 391{
390 struct tag *tag; 392 struct tag *tag;
391 struct taginfo *info; 393 struct taginfo *info;
392 struct object *obj; 394 struct object *obj;
393 char buf[256], *url; 395 char buf[256], *url;
394 unsigned char fileid[20]; 396 unsigned char fileid[20];
395 int *header = (int *)cb_data; 397 int *header = (int *)cb_data;
396 398
397 if (prefixcmp(refname, "refs/archives")) 399 if (prefixcmp(refname, "refs/archives"))
398 return 0; 400 return 0;
399 strncpy(buf, refname+14, sizeof(buf)); 401 strncpy(buf, refname+14, sizeof(buf));
400 obj = parse_object(sha1); 402 obj = parse_object(sha1);
401 if (!obj) 403 if (!obj)
402 return 1; 404 return 1;
403 if (obj->type == OBJ_TAG) { 405 if (obj->type == OBJ_TAG) {
404 tag = lookup_tag(sha1); 406 tag = lookup_tag(sha1);
405 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 407 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
406 return 0; 408 return 0;
407 hashcpy(fileid, tag->tagged->sha1); 409 hashcpy(fileid, tag->tagged->sha1);
408 } else if (obj->type != OBJ_BLOB) { 410 } else if (obj->type != OBJ_BLOB) {
409 return 0; 411 return 0;
410 } else { 412 } else {
411 hashcpy(fileid, sha1); 413 hashcpy(fileid, sha1);
412 } 414 }
413 if (!*header) { 415 if (!*header) {
414 html("<h1>download</h1>\n"); 416 html("<h1>download</h1>\n");
415 *header = 1; 417 *header = 1;
416 } 418 }
417 url = cgit_pageurl(cgit_query_repo, "blob", 419 url = cgit_pageurl(cgit_query_repo, "blob",
418 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 420 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
419 buf)); 421 buf));
420 html_link_open(url, NULL, "menu"); 422 html_link_open(url, NULL, "menu");
421 html_txt(strlpart(buf, 20)); 423 html_txt(strlpart(buf, 20));
422 html_link_close(); 424 html_link_close();
423 return 0; 425 return 0;
424} 426}
425 427
426void add_hidden_formfields(int incl_head, int incl_search, char *page) 428void add_hidden_formfields(int incl_head, int incl_search, char *page)
427{ 429{
428 char *url; 430 char *url;
429 431
430 if (!cgit_virtual_root) { 432 if (!cgit_virtual_root) {
431 url = fmt("%s/%s", cgit_query_repo, page); 433 url = fmt("%s/%s", cgit_query_repo, page);
432 if (cgit_query_path) 434 if (cgit_query_path)
433 url = fmt("%s/%s", url, cgit_query_path); 435 url = fmt("%s/%s", url, cgit_query_path);
434 html_hidden("url", url); 436 html_hidden("url", url);
435 } 437 }
436 438
437 if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) 439 if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
438 html_hidden("h", cgit_query_head); 440 html_hidden("h", cgit_query_head);
439 441
440 if (cgit_query_sha1) 442 if (cgit_query_sha1)
441 html_hidden("id", cgit_query_sha1); 443 html_hidden("id", cgit_query_sha1);
442 if (cgit_query_sha2) 444 if (cgit_query_sha2)
443 html_hidden("id2", cgit_query_sha2); 445 html_hidden("id2", cgit_query_sha2);
444 446
445 if (incl_search) { 447 if (incl_search) {
446 if (cgit_query_grep) 448 if (cgit_query_grep)
447 html_hidden("qt", cgit_query_grep); 449 html_hidden("qt", cgit_query_grep);
448 if (cgit_query_search) 450 if (cgit_query_search)
449 html_hidden("q", cgit_query_search); 451 html_hidden("q", cgit_query_search);
450 } 452 }
451} 453}
452 454
453void cgit_print_pageheader(char *title, int show_search) 455void cgit_print_pageheader(char *title, int show_search)
454{ 456{
455 static const char *default_info = "This is cgit, a fast webinterface for git repositories"; 457 static const char *default_info = "This is cgit, a fast webinterface for git repositories";
456 int header = 0; 458 int header = 0;
457 459
458 html("<div id='sidebar'>\n"); 460 html("<div id='sidebar'>\n");
459 html("<div id='logo'><a href='"); 461 html("<div id='logo'><a href='");
460 html_attr(cgit_rooturl()); 462 html_attr(cgit_rooturl());
461 htmlf("'><img src='%s' alt='cgit'/></a></div>\n", 463 htmlf("'><img src='%s' alt='cgit'/></a></div>\n",
462 cgit_logo); 464 cgit_logo);
463 html("<div class='infobox'>"); 465 html("<div class='infobox'>");
464 if (cgit_query_repo) { 466 if (cgit_query_repo) {
465 html("<h1 class='first'>"); 467 html("<h1 class='first'>");
466 html_txt(strrpart(cgit_repo->name, 20)); 468 html_txt(strrpart(cgit_repo->name, 20));
467 html("</h1>\n"); 469 html("</h1>\n");
468 html_txt(cgit_repo->desc); 470 html_txt(cgit_repo->desc);
469 if (cgit_repo->owner) { 471 if (cgit_repo->owner) {
470 html("<h1>owner</h1>\n"); 472 html("<h1>owner</h1>\n");
471 html_txt(cgit_repo->owner); 473 html_txt(cgit_repo->owner);
472 } 474 }
473 html("<h1>navigate</h1>\n"); 475 html("<h1>navigate</h1>\n");
474 reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, 476 reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
475 NULL, NULL); 477 NULL, NULL);
476 cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, 478 cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
477 0, NULL, NULL); 479 0, NULL, NULL);
478 cgit_tree_link("tree", NULL, "menu", cgit_query_head, 480 cgit_tree_link("tree", NULL, "menu", cgit_query_head,
479 cgit_query_sha1, NULL); 481 cgit_query_sha1, NULL);
480 cgit_commit_link("commit", NULL, "menu", cgit_query_head, 482 cgit_commit_link("commit", NULL, "menu", cgit_query_head,
481 cgit_query_sha1); 483 cgit_query_sha1);
482 cgit_diff_link("diff", NULL, "menu", cgit_query_head, 484 cgit_diff_link("diff", NULL, "menu", cgit_query_head,
483 cgit_query_sha1, cgit_query_sha2, NULL); 485 cgit_query_sha1, cgit_query_sha2, NULL);
484 486
485 for_each_ref(print_archive_ref, &header); 487 for_each_ref(print_archive_ref, &header);
486 488
487 html("<h1>branch</h1>\n"); 489 html("<h1>branch</h1>\n");
488 html("<form method='get' action=''>\n"); 490 html("<form method='get' action=''>\n");
489 add_hidden_formfields(0, 1, cgit_query_page); 491 add_hidden_formfields(0, 1, cgit_query_page);
490 html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); 492 html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
491 html("<select name='h' onchange='this.form.submit();'>\n"); 493 html("<select name='h' onchange='this.form.submit();'>\n");
492 for_each_branch_ref(print_branch_option, cgit_query_head); 494 for_each_branch_ref(print_branch_option, cgit_query_head);
493 html("</select>\n"); 495 html("</select>\n");
494 html("</td><td>"); 496 html("</td><td>");
495 html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n"); 497 html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n");
496 html("</td></tr></table>"); 498 html("</td></tr></table>");
497 html("</form>\n"); 499 html("</form>\n");
498 500
499 html("<h1>search</h1>\n"); 501 html("<h1>search</h1>\n");
500 html("<form method='get' action='"); 502 html("<form method='get' action='");
501 if (cgit_virtual_root) 503 if (cgit_virtual_root)
502 html_attr(cgit_fileurl(cgit_query_repo, "log", 504 html_attr(cgit_fileurl(cgit_query_repo, "log",
503 cgit_query_path, NULL)); 505 cgit_query_path, NULL));
504 html("'>\n"); 506 html("'>\n");
505 add_hidden_formfields(1, 0, "log"); 507 add_hidden_formfields(1, 0, "log");
506 html("<select name='qt'>\n"); 508 html("<select name='qt'>\n");
507 html_option("grep", "log msg", cgit_query_grep); 509 html_option("grep", "log msg", cgit_query_grep);
508 html_option("author", "author", cgit_query_grep); 510 html_option("author", "author", cgit_query_grep);
509 html_option("committer", "committer", cgit_query_grep); 511 html_option("committer", "committer", cgit_query_grep);
510 html("</select>\n"); 512 html("</select>\n");
511 html("<input class='txt' type='text' name='q' value='"); 513 html("<input class='txt' type='text' name='q' value='");
512 html_attr(cgit_query_search); 514 html_attr(cgit_query_search);
513 html("'/>\n"); 515 html("'/>\n");
514 html("</form>\n"); 516 html("</form>\n");
515 } else { 517 } else {
516 if (!cgit_index_info || html_include(cgit_index_info)) 518 if (!cgit_index_info || html_include(cgit_index_info))
517 html(default_info); 519 html(default_info);
518 } 520 }
519 521
520 html("</div>\n"); 522 html("</div>\n");
521 523
522 html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n"); 524 html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n");
523} 525}
524 526
525 527
526void cgit_print_snapshot_start(const char *mimetype, const char *filename, 528void cgit_print_snapshot_start(const char *mimetype, const char *filename,
527 struct cacheitem *item) 529 struct cacheitem *item)
528{ 530{
529 htmlf("Content-Type: %s\n", mimetype); 531 htmlf("Content-Type: %s\n", mimetype);
530 htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); 532 htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
531 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 533 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
532 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 534 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
533 ttl_seconds(item->ttl))); 535 ttl_seconds(item->ttl)));
534 html("\n"); 536 html("\n");
535} 537}
536 538
537/* vim:set sw=8: */ 539/* vim:set sw=8: */