summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--shared.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index dd83f70..b8af970 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,279 +1,280 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <xdiff/xdiff.h> 18#include <xdiff/xdiff.h>
19 19
20 20
21/* 21/*
22 * The valid cgit repo-commands 22 * The valid cgit repo-commands
23 */ 23 */
24#define CMD_LOG 1 24#define CMD_LOG 1
25#define CMD_COMMIT 2 25#define CMD_COMMIT 2
26#define CMD_DIFF 3 26#define CMD_DIFF 3
27#define CMD_TREE 4 27#define CMD_TREE 4
28#define CMD_BLOB 5 28#define CMD_BLOB 5
29#define CMD_SNAPSHOT 6 29#define CMD_SNAPSHOT 6
30#define CMD_TAG 7 30#define CMD_TAG 7
31#define CMD_REFS 8 31#define CMD_REFS 8
32 32
33/* 33/*
34 * Dateformats used on misc. pages 34 * Dateformats used on misc. pages
35 */ 35 */
36#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" 36#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
37#define FMT_SHORTDATE "%Y-%m-%d" 37#define FMT_SHORTDATE "%Y-%m-%d"
38 38
39 39
40/* 40/*
41 * Limits used for relative dates 41 * Limits used for relative dates
42 */ 42 */
43#define TM_MIN 60 43#define TM_MIN 60
44#define TM_HOUR (TM_MIN * 60) 44#define TM_HOUR (TM_MIN * 60)
45#define TM_DAY (TM_HOUR * 24) 45#define TM_DAY (TM_HOUR * 24)
46#define TM_WEEK (TM_DAY * 7) 46#define TM_WEEK (TM_DAY * 7)
47#define TM_YEAR (TM_DAY * 365) 47#define TM_YEAR (TM_DAY * 365)
48#define TM_MONTH (TM_YEAR / 12.0) 48#define TM_MONTH (TM_YEAR / 12.0)
49 49
50 50
51typedef void (*configfn)(const char *name, const char *value); 51typedef void (*configfn)(const char *name, const char *value);
52typedef void (*filepair_fn)(struct diff_filepair *pair); 52typedef void (*filepair_fn)(struct diff_filepair *pair);
53typedef void (*linediff_fn)(char *line, int len); 53typedef void (*linediff_fn)(char *line, int len);
54 54
55struct cacheitem { 55struct cacheitem {
56 char *name; 56 char *name;
57 struct stat st; 57 struct stat st;
58 int ttl; 58 int ttl;
59 int fd; 59 int fd;
60}; 60};
61 61
62struct repoinfo { 62struct repoinfo {
63 char *url; 63 char *url;
64 char *name; 64 char *name;
65 char *path; 65 char *path;
66 char *desc; 66 char *desc;
67 char *owner; 67 char *owner;
68 char *defbranch; 68 char *defbranch;
69 char *group; 69 char *group;
70 char *module_link; 70 char *module_link;
71 char *readme; 71 char *readme;
72 int snapshots; 72 int snapshots;
73 int enable_log_filecount; 73 int enable_log_filecount;
74 int enable_log_linecount; 74 int enable_log_linecount;
75}; 75};
76 76
77struct repolist { 77struct repolist {
78 int length; 78 int length;
79 int count; 79 int count;
80 struct repoinfo *repos; 80 struct repoinfo *repos;
81}; 81};
82 82
83struct commitinfo { 83struct commitinfo {
84 struct commit *commit; 84 struct commit *commit;
85 char *author; 85 char *author;
86 char *author_email; 86 char *author_email;
87 unsigned long author_date; 87 unsigned long author_date;
88 char *committer; 88 char *committer;
89 char *committer_email; 89 char *committer_email;
90 unsigned long committer_date; 90 unsigned long committer_date;
91 char *subject; 91 char *subject;
92 char *msg; 92 char *msg;
93}; 93};
94 94
95struct taginfo { 95struct taginfo {
96 char *tagger; 96 char *tagger;
97 char *tagger_email; 97 char *tagger_email;
98 int tagger_date; 98 int tagger_date;
99 char *msg; 99 char *msg;
100}; 100};
101 101
102struct refinfo { 102struct refinfo {
103 const char *refname; 103 const char *refname;
104 struct object *object; 104 struct object *object;
105 union { 105 union {
106 struct taginfo *tag; 106 struct taginfo *tag;
107 struct commitinfo *commit; 107 struct commitinfo *commit;
108 }; 108 };
109}; 109};
110 110
111struct reflist { 111struct reflist {
112 struct refinfo **refs; 112 struct refinfo **refs;
113 int alloc; 113 int alloc;
114 int count; 114 int count;
115}; 115};
116 116
117extern const char *cgit_version; 117extern const char *cgit_version;
118 118
119extern struct repolist cgit_repolist; 119extern struct repolist cgit_repolist;
120extern struct repoinfo *cgit_repo; 120extern struct repoinfo *cgit_repo;
121extern int cgit_cmd; 121extern int cgit_cmd;
122 122
123extern char *cgit_root_title; 123extern char *cgit_root_title;
124extern char *cgit_css; 124extern char *cgit_css;
125extern char *cgit_logo; 125extern char *cgit_logo;
126extern char *cgit_index_header; 126extern char *cgit_index_header;
127extern char *cgit_index_info;
127extern char *cgit_logo_link; 128extern char *cgit_logo_link;
128extern char *cgit_module_link; 129extern char *cgit_module_link;
129extern char *cgit_agefile; 130extern char *cgit_agefile;
130extern char *cgit_virtual_root; 131extern char *cgit_virtual_root;
131extern char *cgit_script_name; 132extern char *cgit_script_name;
132extern char *cgit_cache_root; 133extern char *cgit_cache_root;
133extern char *cgit_repo_group; 134extern char *cgit_repo_group;
134 135
135extern int cgit_nocache; 136extern int cgit_nocache;
136extern int cgit_snapshots; 137extern int cgit_snapshots;
137extern int cgit_enable_index_links; 138extern int cgit_enable_index_links;
138extern int cgit_enable_log_filecount; 139extern int cgit_enable_log_filecount;
139extern int cgit_enable_log_linecount; 140extern int cgit_enable_log_linecount;
140extern int cgit_max_lock_attempts; 141extern int cgit_max_lock_attempts;
141extern int cgit_cache_root_ttl; 142extern int cgit_cache_root_ttl;
142extern int cgit_cache_repo_ttl; 143extern int cgit_cache_repo_ttl;
143extern int cgit_cache_dynamic_ttl; 144extern int cgit_cache_dynamic_ttl;
144extern int cgit_cache_static_ttl; 145extern int cgit_cache_static_ttl;
145extern int cgit_cache_max_create_time; 146extern int cgit_cache_max_create_time;
146extern int cgit_summary_log; 147extern int cgit_summary_log;
147extern int cgit_summary_tags; 148extern int cgit_summary_tags;
148extern int cgit_summary_branches; 149extern int cgit_summary_branches;
149 150
150extern int cgit_max_msg_len; 151extern int cgit_max_msg_len;
151extern int cgit_max_repodesc_len; 152extern int cgit_max_repodesc_len;
152extern int cgit_max_commit_count; 153extern int cgit_max_commit_count;
153 154
154extern int cgit_query_has_symref; 155extern int cgit_query_has_symref;
155extern int cgit_query_has_sha1; 156extern int cgit_query_has_sha1;
156 157
157extern char *cgit_querystring; 158extern char *cgit_querystring;
158extern char *cgit_query_repo; 159extern char *cgit_query_repo;
159extern char *cgit_query_page; 160extern char *cgit_query_page;
160extern char *cgit_query_search; 161extern char *cgit_query_search;
161extern char *cgit_query_grep; 162extern char *cgit_query_grep;
162extern char *cgit_query_head; 163extern char *cgit_query_head;
163extern char *cgit_query_sha1; 164extern char *cgit_query_sha1;
164extern char *cgit_query_sha2; 165extern char *cgit_query_sha2;
165extern char *cgit_query_path; 166extern char *cgit_query_path;
166extern char *cgit_query_name; 167extern char *cgit_query_name;
167extern int cgit_query_ofs; 168extern int cgit_query_ofs;
168 169
169extern int htmlfd; 170extern int htmlfd;
170 171
171extern int cgit_get_cmd_index(const char *cmd); 172extern int cgit_get_cmd_index(const char *cmd);
172extern struct repoinfo *cgit_get_repoinfo(const char *url); 173extern struct repoinfo *cgit_get_repoinfo(const char *url);
173extern void cgit_global_config_cb(const char *name, const char *value); 174extern void cgit_global_config_cb(const char *name, const char *value);
174extern void cgit_repo_config_cb(const char *name, const char *value); 175extern void cgit_repo_config_cb(const char *name, const char *value);
175extern void cgit_querystring_cb(const char *name, const char *value); 176extern void cgit_querystring_cb(const char *name, const char *value);
176 177
177extern int chk_zero(int result, char *msg); 178extern int chk_zero(int result, char *msg);
178extern int chk_positive(int result, char *msg); 179extern int chk_positive(int result, char *msg);
179extern int chk_non_negative(int result, char *msg); 180extern int chk_non_negative(int result, char *msg);
180 181
181extern int hextoint(char c); 182extern int hextoint(char c);
182extern char *trim_end(const char *str, char c); 183extern char *trim_end(const char *str, char c);
183 184
184extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 185extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
185extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 186extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
186 int flags, void *cb_data); 187 int flags, void *cb_data);
187 188
188extern void *cgit_free_commitinfo(struct commitinfo *info); 189extern void *cgit_free_commitinfo(struct commitinfo *info);
189 190
190extern int cgit_diff_files(const unsigned char *old_sha1, 191extern int cgit_diff_files(const unsigned char *old_sha1,
191 const unsigned char *new_sha1, 192 const unsigned char *new_sha1,
192 linediff_fn fn); 193 linediff_fn fn);
193 194
194extern void cgit_diff_tree(const unsigned char *old_sha1, 195extern void cgit_diff_tree(const unsigned char *old_sha1,
195 const unsigned char *new_sha1, 196 const unsigned char *new_sha1,
196 filepair_fn fn, const char *prefix); 197 filepair_fn fn, const char *prefix);
197 198
198extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 199extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
199 200
200extern char *fmt(const char *format,...); 201extern char *fmt(const char *format,...);
201 202
202extern void html(const char *txt); 203extern void html(const char *txt);
203extern void htmlf(const char *format,...); 204extern void htmlf(const char *format,...);
204extern void html_txt(char *txt); 205extern void html_txt(char *txt);
205extern void html_ntxt(int len, char *txt); 206extern void html_ntxt(int len, char *txt);
206extern void html_attr(char *txt); 207extern void html_attr(char *txt);
207extern void html_hidden(char *name, char *value); 208extern void html_hidden(char *name, char *value);
208extern void html_option(char *value, char *text, char *selected_value); 209extern void html_option(char *value, char *text, char *selected_value);
209extern void html_link_open(char *url, char *title, char *class); 210extern void html_link_open(char *url, char *title, char *class);
210extern void html_link_close(void); 211extern void html_link_close(void);
211extern void html_filemode(unsigned short mode); 212extern void html_filemode(unsigned short mode);
212extern int html_include(const char *filename); 213extern int html_include(const char *filename);
213 214
214extern int cgit_read_config(const char *filename, configfn fn); 215extern int cgit_read_config(const char *filename, configfn fn);
215extern int cgit_parse_query(char *txt, configfn fn); 216extern int cgit_parse_query(char *txt, configfn fn);
216extern struct commitinfo *cgit_parse_commit(struct commit *commit); 217extern struct commitinfo *cgit_parse_commit(struct commit *commit);
217extern struct taginfo *cgit_parse_tag(struct tag *tag); 218extern struct taginfo *cgit_parse_tag(struct tag *tag);
218extern void cgit_parse_url(const char *url); 219extern void cgit_parse_url(const char *url);
219 220
220extern char *cache_safe_filename(const char *unsafe); 221extern char *cache_safe_filename(const char *unsafe);
221extern int cache_lock(struct cacheitem *item); 222extern int cache_lock(struct cacheitem *item);
222extern int cache_unlock(struct cacheitem *item); 223extern int cache_unlock(struct cacheitem *item);
223extern int cache_cancel_lock(struct cacheitem *item); 224extern int cache_cancel_lock(struct cacheitem *item);
224extern int cache_exist(struct cacheitem *item); 225extern int cache_exist(struct cacheitem *item);
225extern int cache_expired(struct cacheitem *item); 226extern int cache_expired(struct cacheitem *item);
226 227
227extern char *cgit_repourl(const char *reponame); 228extern char *cgit_repourl(const char *reponame);
228extern char *cgit_fileurl(const char *reponame, const char *pagename, 229extern char *cgit_fileurl(const char *reponame, const char *pagename,
229 const char *filename, const char *query); 230 const char *filename, const char *query);
230extern char *cgit_pageurl(const char *reponame, const char *pagename, 231extern char *cgit_pageurl(const char *reponame, const char *pagename,
231 const char *query); 232 const char *query);
232 233
233extern const char *cgit_repobasename(const char *reponame); 234extern const char *cgit_repobasename(const char *reponame);
234 235
235extern void cgit_tree_link(char *name, char *title, char *class, char *head, 236extern void cgit_tree_link(char *name, char *title, char *class, char *head,
236 char *rev, char *path); 237 char *rev, char *path);
237extern void cgit_log_link(char *name, char *title, char *class, char *head, 238extern void cgit_log_link(char *name, char *title, char *class, char *head,
238 char *rev, char *path, int ofs); 239 char *rev, char *path, int ofs);
239extern void cgit_commit_link(char *name, char *title, char *class, char *head, 240extern void cgit_commit_link(char *name, char *title, char *class, char *head,
240 char *rev); 241 char *rev);
241extern void cgit_refs_link(char *name, char *title, char *class, char *head, 242extern void cgit_refs_link(char *name, char *title, char *class, char *head,
242 char *rev, char *path); 243 char *rev, char *path);
243extern void cgit_snapshot_link(char *name, char *title, char *class, 244extern void cgit_snapshot_link(char *name, char *title, char *class,
244 char *head, char *rev, char *archivename); 245 char *head, char *rev, char *archivename);
245extern void cgit_diff_link(char *name, char *title, char *class, char *head, 246extern void cgit_diff_link(char *name, char *title, char *class, char *head,
246 char *new_rev, char *old_rev, char *path); 247 char *new_rev, char *old_rev, char *path);
247 248
248extern void cgit_object_link(struct object *obj); 249extern void cgit_object_link(struct object *obj);
249 250
250extern void cgit_print_error(char *msg); 251extern void cgit_print_error(char *msg);
251extern void cgit_print_date(time_t secs, char *format); 252extern void cgit_print_date(time_t secs, char *format);
252extern void cgit_print_age(time_t t, time_t max_relative, char *format); 253extern void cgit_print_age(time_t t, time_t max_relative, char *format);
253extern void cgit_print_docstart(char *title, struct cacheitem *item); 254extern void cgit_print_docstart(char *title, struct cacheitem *item);
254extern void cgit_print_docend(); 255extern void cgit_print_docend();
255extern void cgit_print_pageheader(char *title, int show_search); 256extern void cgit_print_pageheader(char *title, int show_search);
256extern void cgit_print_snapshot_start(const char *mimetype, 257extern void cgit_print_snapshot_start(const char *mimetype,
257 const char *filename, 258 const char *filename,
258 struct cacheitem *item); 259 struct cacheitem *item);
259extern void cgit_print_branches(int maxcount); 260extern void cgit_print_branches(int maxcount);
260extern void cgit_print_tags(int maxcount); 261extern void cgit_print_tags(int maxcount);
261 262
262extern void cgit_print_repolist(struct cacheitem *item); 263extern void cgit_print_repolist(struct cacheitem *item);
263extern void cgit_print_summary(); 264extern void cgit_print_summary();
264extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 265extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
265 char *pattern, char *path, int pager); 266 char *pattern, char *path, int pager);
266extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 267extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
267extern void cgit_print_tree(const char *rev, char *path); 268extern void cgit_print_tree(const char *rev, char *path);
268extern void cgit_print_commit(char *hex); 269extern void cgit_print_commit(char *hex);
269extern void cgit_print_refs(); 270extern void cgit_print_refs();
270extern void cgit_print_tag(char *revname); 271extern void cgit_print_tag(char *revname);
271extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); 272extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
272extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 273extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
273 const char *hex, const char *prefix, 274 const char *hex, const char *prefix,
274 const char *filename, int snapshot); 275 const char *filename, int snapshot);
275extern void cgit_print_snapshot_links(const char *repo, const char *head, 276extern void cgit_print_snapshot_links(const char *repo, const char *head,
276 const char *hex, int snapshots); 277 const char *hex, int snapshots);
277extern int cgit_parse_snapshots_mask(const char *str); 278extern int cgit_parse_snapshots_mask(const char *str);
278 279
279#endif /* CGIT_H */ 280#endif /* CGIT_H */
diff --git a/shared.c b/shared.c
index 4fab1c9..50fe8e1 100644
--- a/shared.c
+++ b/shared.c
@@ -1,475 +1,478 @@
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_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
22char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 23char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
23char *cgit_agefile = "info/web/last-modified"; 24char *cgit_agefile = "info/web/last-modified";
24char *cgit_virtual_root = NULL; 25char *cgit_virtual_root = NULL;
25char *cgit_script_name = CGIT_SCRIPT_NAME; 26char *cgit_script_name = CGIT_SCRIPT_NAME;
26char *cgit_cache_root = CGIT_CACHE_ROOT; 27char *cgit_cache_root = CGIT_CACHE_ROOT;
27char *cgit_repo_group = NULL; 28char *cgit_repo_group = NULL;
28 29
29int cgit_nocache = 0; 30int cgit_nocache = 0;
30int cgit_snapshots = 0; 31int cgit_snapshots = 0;
31int cgit_enable_index_links = 0; 32int cgit_enable_index_links = 0;
32int cgit_enable_log_filecount = 0; 33int cgit_enable_log_filecount = 0;
33int cgit_enable_log_linecount = 0; 34int cgit_enable_log_linecount = 0;
34int cgit_max_lock_attempts = 5; 35int cgit_max_lock_attempts = 5;
35int cgit_cache_root_ttl = 5; 36int cgit_cache_root_ttl = 5;
36int cgit_cache_repo_ttl = 5; 37int cgit_cache_repo_ttl = 5;
37int cgit_cache_dynamic_ttl = 5; 38int cgit_cache_dynamic_ttl = 5;
38int cgit_cache_static_ttl = -1; 39int cgit_cache_static_ttl = -1;
39int cgit_cache_max_create_time = 5; 40int cgit_cache_max_create_time = 5;
40int cgit_summary_log = 0; 41int cgit_summary_log = 0;
41int cgit_summary_tags = 0; 42int cgit_summary_tags = 0;
42int cgit_summary_branches = 0; 43int cgit_summary_branches = 0;
43int cgit_renamelimit = -1; 44int cgit_renamelimit = -1;
44 45
45int cgit_max_msg_len = 60; 46int cgit_max_msg_len = 60;
46int cgit_max_repodesc_len = 60; 47int cgit_max_repodesc_len = 60;
47int cgit_max_commit_count = 50; 48int cgit_max_commit_count = 50;
48 49
49int cgit_query_has_symref = 0; 50int cgit_query_has_symref = 0;
50int cgit_query_has_sha1 = 0; 51int cgit_query_has_sha1 = 0;
51 52
52char *cgit_querystring = NULL; 53char *cgit_querystring = NULL;
53char *cgit_query_repo = NULL; 54char *cgit_query_repo = NULL;
54char *cgit_query_page = NULL; 55char *cgit_query_page = NULL;
55char *cgit_query_head = NULL; 56char *cgit_query_head = NULL;
56char *cgit_query_search = NULL; 57char *cgit_query_search = NULL;
57char *cgit_query_grep = NULL; 58char *cgit_query_grep = NULL;
58char *cgit_query_sha1 = NULL; 59char *cgit_query_sha1 = NULL;
59char *cgit_query_sha2 = NULL; 60char *cgit_query_sha2 = NULL;
60char *cgit_query_path = NULL; 61char *cgit_query_path = NULL;
61char *cgit_query_name = NULL; 62char *cgit_query_name = NULL;
62int cgit_query_ofs = 0; 63int cgit_query_ofs = 0;
63 64
64int htmlfd = 0; 65int htmlfd = 0;
65 66
66 67
67int cgit_get_cmd_index(const char *cmd) 68int cgit_get_cmd_index(const char *cmd)
68{ 69{
69 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 70 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
70 "snapshot", "tag", "refs", NULL}; 71 "snapshot", "tag", "refs", NULL};
71 int i; 72 int i;
72 73
73 for(i = 0; cmds[i]; i++) 74 for(i = 0; cmds[i]; i++)
74 if (!strcmp(cmd, cmds[i])) 75 if (!strcmp(cmd, cmds[i]))
75 return i + 1; 76 return i + 1;
76 return 0; 77 return 0;
77} 78}
78 79
79int chk_zero(int result, char *msg) 80int chk_zero(int result, char *msg)
80{ 81{
81 if (result != 0) 82 if (result != 0)
82 die("%s: %s", msg, strerror(errno)); 83 die("%s: %s", msg, strerror(errno));
83 return result; 84 return result;
84} 85}
85 86
86int chk_positive(int result, char *msg) 87int chk_positive(int result, char *msg)
87{ 88{
88 if (result <= 0) 89 if (result <= 0)
89 die("%s: %s", msg, strerror(errno)); 90 die("%s: %s", msg, strerror(errno));
90 return result; 91 return result;
91} 92}
92 93
93int chk_non_negative(int result, char *msg) 94int chk_non_negative(int result, char *msg)
94{ 95{
95 if (result < 0) 96 if (result < 0)
96 die("%s: %s",msg, strerror(errno)); 97 die("%s: %s",msg, strerror(errno));
97 return result; 98 return result;
98} 99}
99 100
100struct repoinfo *add_repo(const char *url) 101struct repoinfo *add_repo(const char *url)
101{ 102{
102 struct repoinfo *ret; 103 struct repoinfo *ret;
103 104
104 if (++cgit_repolist.count > cgit_repolist.length) { 105 if (++cgit_repolist.count > cgit_repolist.length) {
105 if (cgit_repolist.length == 0) 106 if (cgit_repolist.length == 0)
106 cgit_repolist.length = 8; 107 cgit_repolist.length = 8;
107 else 108 else
108 cgit_repolist.length *= 2; 109 cgit_repolist.length *= 2;
109 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 110 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
110 cgit_repolist.length * 111 cgit_repolist.length *
111 sizeof(struct repoinfo)); 112 sizeof(struct repoinfo));
112 } 113 }
113 114
114 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 115 ret = &cgit_repolist.repos[cgit_repolist.count-1];
115 ret->url = trim_end(url, '/'); 116 ret->url = trim_end(url, '/');
116 ret->name = ret->url; 117 ret->name = ret->url;
117 ret->path = NULL; 118 ret->path = NULL;
118 ret->desc = NULL; 119 ret->desc = NULL;
119 ret->owner = NULL; 120 ret->owner = NULL;
120 ret->group = cgit_repo_group; 121 ret->group = cgit_repo_group;
121 ret->defbranch = "master"; 122 ret->defbranch = "master";
122 ret->snapshots = cgit_snapshots; 123 ret->snapshots = cgit_snapshots;
123 ret->enable_log_filecount = cgit_enable_log_filecount; 124 ret->enable_log_filecount = cgit_enable_log_filecount;
124 ret->enable_log_linecount = cgit_enable_log_linecount; 125 ret->enable_log_linecount = cgit_enable_log_linecount;
125 ret->module_link = cgit_module_link; 126 ret->module_link = cgit_module_link;
126 ret->readme = NULL; 127 ret->readme = NULL;
127 return ret; 128 return ret;
128} 129}
129 130
130struct repoinfo *cgit_get_repoinfo(const char *url) 131struct repoinfo *cgit_get_repoinfo(const char *url)
131{ 132{
132 int i; 133 int i;
133 struct repoinfo *repo; 134 struct repoinfo *repo;
134 135
135 for (i=0; i<cgit_repolist.count; i++) { 136 for (i=0; i<cgit_repolist.count; i++) {
136 repo = &cgit_repolist.repos[i]; 137 repo = &cgit_repolist.repos[i];
137 if (!strcmp(repo->url, url)) 138 if (!strcmp(repo->url, url))
138 return repo; 139 return repo;
139 } 140 }
140 return NULL; 141 return NULL;
141} 142}
142 143
143void cgit_global_config_cb(const char *name, const char *value) 144void cgit_global_config_cb(const char *name, const char *value)
144{ 145{
145 if (!strcmp(name, "root-title")) 146 if (!strcmp(name, "root-title"))
146 cgit_root_title = xstrdup(value); 147 cgit_root_title = xstrdup(value);
147 else if (!strcmp(name, "css")) 148 else if (!strcmp(name, "css"))
148 cgit_css = xstrdup(value); 149 cgit_css = xstrdup(value);
149 else if (!strcmp(name, "logo")) 150 else if (!strcmp(name, "logo"))
150 cgit_logo = xstrdup(value); 151 cgit_logo = xstrdup(value);
151 else if (!strcmp(name, "index-header")) 152 else if (!strcmp(name, "index-header"))
152 cgit_index_header = xstrdup(value); 153 cgit_index_header = xstrdup(value);
154 else if (!strcmp(name, "index-info"))
155 cgit_index_info = xstrdup(value);
153 else if (!strcmp(name, "logo-link")) 156 else if (!strcmp(name, "logo-link"))
154 cgit_logo_link = xstrdup(value); 157 cgit_logo_link = xstrdup(value);
155 else if (!strcmp(name, "module-link")) 158 else if (!strcmp(name, "module-link"))
156 cgit_module_link = xstrdup(value); 159 cgit_module_link = xstrdup(value);
157 else if (!strcmp(name, "virtual-root")) 160 else if (!strcmp(name, "virtual-root"))
158 cgit_virtual_root = trim_end(value, '/'); 161 cgit_virtual_root = trim_end(value, '/');
159 else if (!strcmp(name, "nocache")) 162 else if (!strcmp(name, "nocache"))
160 cgit_nocache = atoi(value); 163 cgit_nocache = atoi(value);
161 else if (!strcmp(name, "snapshots")) 164 else if (!strcmp(name, "snapshots"))
162 cgit_snapshots = cgit_parse_snapshots_mask(value); 165 cgit_snapshots = cgit_parse_snapshots_mask(value);
163 else if (!strcmp(name, "enable-index-links")) 166 else if (!strcmp(name, "enable-index-links"))
164 cgit_enable_index_links = atoi(value); 167 cgit_enable_index_links = atoi(value);
165 else if (!strcmp(name, "enable-log-filecount")) 168 else if (!strcmp(name, "enable-log-filecount"))
166 cgit_enable_log_filecount = atoi(value); 169 cgit_enable_log_filecount = atoi(value);
167 else if (!strcmp(name, "enable-log-linecount")) 170 else if (!strcmp(name, "enable-log-linecount"))
168 cgit_enable_log_linecount = atoi(value); 171 cgit_enable_log_linecount = atoi(value);
169 else if (!strcmp(name, "cache-root")) 172 else if (!strcmp(name, "cache-root"))
170 cgit_cache_root = xstrdup(value); 173 cgit_cache_root = xstrdup(value);
171 else if (!strcmp(name, "cache-root-ttl")) 174 else if (!strcmp(name, "cache-root-ttl"))
172 cgit_cache_root_ttl = atoi(value); 175 cgit_cache_root_ttl = atoi(value);
173 else if (!strcmp(name, "cache-repo-ttl")) 176 else if (!strcmp(name, "cache-repo-ttl"))
174 cgit_cache_repo_ttl = atoi(value); 177 cgit_cache_repo_ttl = atoi(value);
175 else if (!strcmp(name, "cache-static-ttl")) 178 else if (!strcmp(name, "cache-static-ttl"))
176 cgit_cache_static_ttl = atoi(value); 179 cgit_cache_static_ttl = atoi(value);
177 else if (!strcmp(name, "cache-dynamic-ttl")) 180 else if (!strcmp(name, "cache-dynamic-ttl"))
178 cgit_cache_dynamic_ttl = atoi(value); 181 cgit_cache_dynamic_ttl = atoi(value);
179 else if (!strcmp(name, "max-message-length")) 182 else if (!strcmp(name, "max-message-length"))
180 cgit_max_msg_len = atoi(value); 183 cgit_max_msg_len = atoi(value);
181 else if (!strcmp(name, "max-repodesc-length")) 184 else if (!strcmp(name, "max-repodesc-length"))
182 cgit_max_repodesc_len = atoi(value); 185 cgit_max_repodesc_len = atoi(value);
183 else if (!strcmp(name, "max-commit-count")) 186 else if (!strcmp(name, "max-commit-count"))
184 cgit_max_commit_count = atoi(value); 187 cgit_max_commit_count = atoi(value);
185 else if (!strcmp(name, "summary-log")) 188 else if (!strcmp(name, "summary-log"))
186 cgit_summary_log = atoi(value); 189 cgit_summary_log = atoi(value);
187 else if (!strcmp(name, "summary-branches")) 190 else if (!strcmp(name, "summary-branches"))
188 cgit_summary_branches = atoi(value); 191 cgit_summary_branches = atoi(value);
189 else if (!strcmp(name, "summary-tags")) 192 else if (!strcmp(name, "summary-tags"))
190 cgit_summary_tags = atoi(value); 193 cgit_summary_tags = atoi(value);
191 else if (!strcmp(name, "agefile")) 194 else if (!strcmp(name, "agefile"))
192 cgit_agefile = xstrdup(value); 195 cgit_agefile = xstrdup(value);
193 else if (!strcmp(name, "renamelimit")) 196 else if (!strcmp(name, "renamelimit"))
194 cgit_renamelimit = atoi(value); 197 cgit_renamelimit = atoi(value);
195 else if (!strcmp(name, "repo.group")) 198 else if (!strcmp(name, "repo.group"))
196 cgit_repo_group = xstrdup(value); 199 cgit_repo_group = xstrdup(value);
197 else if (!strcmp(name, "repo.url")) 200 else if (!strcmp(name, "repo.url"))
198 cgit_repo = add_repo(value); 201 cgit_repo = add_repo(value);
199 else if (!strcmp(name, "repo.name")) 202 else if (!strcmp(name, "repo.name"))
200 cgit_repo->name = xstrdup(value); 203 cgit_repo->name = xstrdup(value);
201 else if (cgit_repo && !strcmp(name, "repo.path")) 204 else if (cgit_repo && !strcmp(name, "repo.path"))
202 cgit_repo->path = trim_end(value, '/'); 205 cgit_repo->path = trim_end(value, '/');
203 else if (cgit_repo && !strcmp(name, "repo.desc")) 206 else if (cgit_repo && !strcmp(name, "repo.desc"))
204 cgit_repo->desc = xstrdup(value); 207 cgit_repo->desc = xstrdup(value);
205 else if (cgit_repo && !strcmp(name, "repo.owner")) 208 else if (cgit_repo && !strcmp(name, "repo.owner"))
206 cgit_repo->owner = xstrdup(value); 209 cgit_repo->owner = xstrdup(value);
207 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 210 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
208 cgit_repo->defbranch = xstrdup(value); 211 cgit_repo->defbranch = xstrdup(value);
209 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 212 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
210 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 213 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
211 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 214 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
212 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 215 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
213 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 216 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
214 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 217 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
215 else if (cgit_repo && !strcmp(name, "repo.module-link")) 218 else if (cgit_repo && !strcmp(name, "repo.module-link"))
216 cgit_repo->module_link= xstrdup(value); 219 cgit_repo->module_link= xstrdup(value);
217 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { 220 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
218 if (*value == '/') 221 if (*value == '/')
219 cgit_repo->readme = xstrdup(value); 222 cgit_repo->readme = xstrdup(value);
220 else 223 else
221 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); 224 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
222 } else if (!strcmp(name, "include")) 225 } else if (!strcmp(name, "include"))
223 cgit_read_config(value, cgit_global_config_cb); 226 cgit_read_config(value, cgit_global_config_cb);
224} 227}
225 228
226void cgit_querystring_cb(const char *name, const char *value) 229void cgit_querystring_cb(const char *name, const char *value)
227{ 230{
228 if (!strcmp(name,"r")) { 231 if (!strcmp(name,"r")) {
229 cgit_query_repo = xstrdup(value); 232 cgit_query_repo = xstrdup(value);
230 cgit_repo = cgit_get_repoinfo(value); 233 cgit_repo = cgit_get_repoinfo(value);
231 } else if (!strcmp(name, "p")) { 234 } else if (!strcmp(name, "p")) {
232 cgit_query_page = xstrdup(value); 235 cgit_query_page = xstrdup(value);
233 cgit_cmd = cgit_get_cmd_index(value); 236 cgit_cmd = cgit_get_cmd_index(value);
234 } else if (!strcmp(name, "url")) { 237 } else if (!strcmp(name, "url")) {
235 cgit_parse_url(value); 238 cgit_parse_url(value);
236 } else if (!strcmp(name, "qt")) { 239 } else if (!strcmp(name, "qt")) {
237 cgit_query_grep = xstrdup(value); 240 cgit_query_grep = xstrdup(value);
238 } else if (!strcmp(name, "q")) { 241 } else if (!strcmp(name, "q")) {
239 cgit_query_search = xstrdup(value); 242 cgit_query_search = xstrdup(value);
240 } else if (!strcmp(name, "h")) { 243 } else if (!strcmp(name, "h")) {
241 cgit_query_head = xstrdup(value); 244 cgit_query_head = xstrdup(value);
242 cgit_query_has_symref = 1; 245 cgit_query_has_symref = 1;
243 } else if (!strcmp(name, "id")) { 246 } else if (!strcmp(name, "id")) {
244 cgit_query_sha1 = xstrdup(value); 247 cgit_query_sha1 = xstrdup(value);
245 cgit_query_has_sha1 = 1; 248 cgit_query_has_sha1 = 1;
246 } else if (!strcmp(name, "id2")) { 249 } else if (!strcmp(name, "id2")) {
247 cgit_query_sha2 = xstrdup(value); 250 cgit_query_sha2 = xstrdup(value);
248 cgit_query_has_sha1 = 1; 251 cgit_query_has_sha1 = 1;
249 } else if (!strcmp(name, "ofs")) { 252 } else if (!strcmp(name, "ofs")) {
250 cgit_query_ofs = atoi(value); 253 cgit_query_ofs = atoi(value);
251 } else if (!strcmp(name, "path")) { 254 } else if (!strcmp(name, "path")) {
252 cgit_query_path = trim_end(value, '/'); 255 cgit_query_path = trim_end(value, '/');
253 } else if (!strcmp(name, "name")) { 256 } else if (!strcmp(name, "name")) {
254 cgit_query_name = xstrdup(value); 257 cgit_query_name = xstrdup(value);
255 } 258 }
256} 259}
257 260
258void *cgit_free_commitinfo(struct commitinfo *info) 261void *cgit_free_commitinfo(struct commitinfo *info)
259{ 262{
260 free(info->author); 263 free(info->author);
261 free(info->author_email); 264 free(info->author_email);
262 free(info->committer); 265 free(info->committer);
263 free(info->committer_email); 266 free(info->committer_email);
264 free(info->subject); 267 free(info->subject);
265 free(info); 268 free(info);
266 return NULL; 269 return NULL;
267} 270}
268 271
269int hextoint(char c) 272int hextoint(char c)
270{ 273{
271 if (c >= 'a' && c <= 'f') 274 if (c >= 'a' && c <= 'f')
272 return 10 + c - 'a'; 275 return 10 + c - 'a';
273 else if (c >= 'A' && c <= 'F') 276 else if (c >= 'A' && c <= 'F')
274 return 10 + c - 'A'; 277 return 10 + c - 'A';
275 else if (c >= '0' && c <= '9') 278 else if (c >= '0' && c <= '9')
276 return c - '0'; 279 return c - '0';
277 else 280 else
278 return -1; 281 return -1;
279} 282}
280 283
281char *trim_end(const char *str, char c) 284char *trim_end(const char *str, char c)
282{ 285{
283 int len; 286 int len;
284 char *s, *t; 287 char *s, *t;
285 288
286 if (str == NULL) 289 if (str == NULL)
287 return NULL; 290 return NULL;
288 t = (char *)str; 291 t = (char *)str;
289 len = strlen(t); 292 len = strlen(t);
290 while(len > 0 && t[len - 1] == c) 293 while(len > 0 && t[len - 1] == c)
291 len--; 294 len--;
292 295
293 if (len == 0) 296 if (len == 0)
294 return NULL; 297 return NULL;
295 298
296 c = t[len]; 299 c = t[len];
297 t[len] = '\0'; 300 t[len] = '\0';
298 s = xstrdup(t); 301 s = xstrdup(t);
299 t[len] = c; 302 t[len] = c;
300 return s; 303 return s;
301} 304}
302 305
303void cgit_add_ref(struct reflist *list, struct refinfo *ref) 306void cgit_add_ref(struct reflist *list, struct refinfo *ref)
304{ 307{
305 size_t size; 308 size_t size;
306 309
307 if (list->count >= list->alloc) { 310 if (list->count >= list->alloc) {
308 list->alloc += (list->alloc ? list->alloc : 4); 311 list->alloc += (list->alloc ? list->alloc : 4);
309 size = list->alloc * sizeof(struct refinfo *); 312 size = list->alloc * sizeof(struct refinfo *);
310 list->refs = xrealloc(list->refs, size); 313 list->refs = xrealloc(list->refs, size);
311 } 314 }
312 list->refs[list->count++] = ref; 315 list->refs[list->count++] = ref;
313} 316}
314 317
315struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) 318struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
316{ 319{
317 struct refinfo *ref; 320 struct refinfo *ref;
318 321
319 ref = xmalloc(sizeof (struct refinfo)); 322 ref = xmalloc(sizeof (struct refinfo));
320 ref->refname = xstrdup(refname); 323 ref->refname = xstrdup(refname);
321 ref->object = parse_object(sha1); 324 ref->object = parse_object(sha1);
322 switch (ref->object->type) { 325 switch (ref->object->type) {
323 case OBJ_TAG: 326 case OBJ_TAG:
324 ref->tag = cgit_parse_tag((struct tag *)ref->object); 327 ref->tag = cgit_parse_tag((struct tag *)ref->object);
325 break; 328 break;
326 case OBJ_COMMIT: 329 case OBJ_COMMIT:
327 ref->commit = cgit_parse_commit((struct commit *)ref->object); 330 ref->commit = cgit_parse_commit((struct commit *)ref->object);
328 break; 331 break;
329 } 332 }
330 return ref; 333 return ref;
331} 334}
332 335
333int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, 336int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
334 void *cb_data) 337 void *cb_data)
335{ 338{
336 struct reflist *list = (struct reflist *)cb_data; 339 struct reflist *list = (struct reflist *)cb_data;
337 struct refinfo *info = cgit_mk_refinfo(refname, sha1); 340 struct refinfo *info = cgit_mk_refinfo(refname, sha1);
338 341
339 if (info) 342 if (info)
340 cgit_add_ref(list, info); 343 cgit_add_ref(list, info);
341 return 0; 344 return 0;
342} 345}
343 346
344void cgit_diff_tree_cb(struct diff_queue_struct *q, 347void cgit_diff_tree_cb(struct diff_queue_struct *q,
345 struct diff_options *options, void *data) 348 struct diff_options *options, void *data)
346{ 349{
347 int i; 350 int i;
348 351
349 for (i = 0; i < q->nr; i++) { 352 for (i = 0; i < q->nr; i++) {
350 if (q->queue[i]->status == 'U') 353 if (q->queue[i]->status == 'U')
351 continue; 354 continue;
352 ((filepair_fn)data)(q->queue[i]); 355 ((filepair_fn)data)(q->queue[i]);
353 } 356 }
354} 357}
355 358
356static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 359static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
357{ 360{
358 enum object_type type; 361 enum object_type type;
359 362
360 if (is_null_sha1(sha1)) { 363 if (is_null_sha1(sha1)) {
361 file->ptr = (char *)""; 364 file->ptr = (char *)"";
362 file->size = 0; 365 file->size = 0;
363 } else { 366 } else {
364 file->ptr = read_sha1_file(sha1, &type, 367 file->ptr = read_sha1_file(sha1, &type,
365 (unsigned long *)&file->size); 368 (unsigned long *)&file->size);
366 } 369 }
367 return 1; 370 return 1;
368} 371}
369 372
370/* 373/*
371 * Receive diff-buffers from xdiff and concatenate them as 374 * Receive diff-buffers from xdiff and concatenate them as
372 * needed across multiple callbacks. 375 * needed across multiple callbacks.
373 * 376 *
374 * This is basically a copy of xdiff-interface.c/xdiff_outf(), 377 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
375 * ripped from git and modified to use globals instead of 378 * ripped from git and modified to use globals instead of
376 * a special callback-struct. 379 * a special callback-struct.
377 */ 380 */
378char *diffbuf = NULL; 381char *diffbuf = NULL;
379int buflen = 0; 382int buflen = 0;
380 383
381int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 384int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
382{ 385{
383 int i; 386 int i;
384 387
385 for (i = 0; i < nbuf; i++) { 388 for (i = 0; i < nbuf; i++) {
386 if (mb[i].ptr[mb[i].size-1] != '\n') { 389 if (mb[i].ptr[mb[i].size-1] != '\n') {
387 /* Incomplete line */ 390 /* Incomplete line */
388 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 391 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
389 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 392 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
390 buflen += mb[i].size; 393 buflen += mb[i].size;
391 continue; 394 continue;
392 } 395 }
393 396
394 /* we have a complete line */ 397 /* we have a complete line */
395 if (!diffbuf) { 398 if (!diffbuf) {
396 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 399 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
397 continue; 400 continue;
398 } 401 }
399 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 402 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
400 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 403 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
401 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 404 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
402 free(diffbuf); 405 free(diffbuf);
403 diffbuf = NULL; 406 diffbuf = NULL;
404 buflen = 0; 407 buflen = 0;
405 } 408 }
406 if (diffbuf) { 409 if (diffbuf) {
407 ((linediff_fn)priv)(diffbuf, buflen); 410 ((linediff_fn)priv)(diffbuf, buflen);
408 free(diffbuf); 411 free(diffbuf);
409 diffbuf = NULL; 412 diffbuf = NULL;
410 buflen = 0; 413 buflen = 0;
411 } 414 }
412 return 0; 415 return 0;
413} 416}
414 417
415int cgit_diff_files(const unsigned char *old_sha1, 418int cgit_diff_files(const unsigned char *old_sha1,
416 const unsigned char *new_sha1, 419 const unsigned char *new_sha1,
417 linediff_fn fn) 420 linediff_fn fn)
418{ 421{
419 mmfile_t file1, file2; 422 mmfile_t file1, file2;
420 xpparam_t diff_params; 423 xpparam_t diff_params;
421 xdemitconf_t emit_params; 424 xdemitconf_t emit_params;
422 xdemitcb_t emit_cb; 425 xdemitcb_t emit_cb;
423 426
424 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 427 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
425 return 1; 428 return 1;
426 429
427 diff_params.flags = XDF_NEED_MINIMAL; 430 diff_params.flags = XDF_NEED_MINIMAL;
428 emit_params.ctxlen = 3; 431 emit_params.ctxlen = 3;
429 emit_params.flags = XDL_EMIT_FUNCNAMES; 432 emit_params.flags = XDL_EMIT_FUNCNAMES;
430 emit_params.find_func = NULL; 433 emit_params.find_func = NULL;
431 emit_cb.outf = filediff_cb; 434 emit_cb.outf = filediff_cb;
432 emit_cb.priv = fn; 435 emit_cb.priv = fn;
433 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 436 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
434 return 0; 437 return 0;
435} 438}
436 439
437void cgit_diff_tree(const unsigned char *old_sha1, 440void cgit_diff_tree(const unsigned char *old_sha1,
438 const unsigned char *new_sha1, 441 const unsigned char *new_sha1,
439 filepair_fn fn, const char *prefix) 442 filepair_fn fn, const char *prefix)
440{ 443{
441 struct diff_options opt; 444 struct diff_options opt;
442 int ret; 445 int ret;
443 int prefixlen; 446 int prefixlen;
444 447
445 diff_setup(&opt); 448 diff_setup(&opt);
446 opt.output_format = DIFF_FORMAT_CALLBACK; 449 opt.output_format = DIFF_FORMAT_CALLBACK;
447 opt.detect_rename = 1; 450 opt.detect_rename = 1;
448 opt.rename_limit = cgit_renamelimit; 451 opt.rename_limit = cgit_renamelimit;
449 opt.recursive = 1; 452 opt.recursive = 1;
450 opt.format_callback = cgit_diff_tree_cb; 453 opt.format_callback = cgit_diff_tree_cb;
451 opt.format_callback_data = fn; 454 opt.format_callback_data = fn;
452 if (prefix) { 455 if (prefix) {
453 opt.nr_paths = 1; 456 opt.nr_paths = 1;
454 opt.paths = &prefix; 457 opt.paths = &prefix;
455 prefixlen = strlen(prefix); 458 prefixlen = strlen(prefix);
456 opt.pathlens = &prefixlen; 459 opt.pathlens = &prefixlen;
457 } 460 }
458 diff_setup_done(&opt); 461 diff_setup_done(&opt);
459 462
460 if (old_sha1 && !is_null_sha1(old_sha1)) 463 if (old_sha1 && !is_null_sha1(old_sha1))
461 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 464 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
462 else 465 else
463 ret = diff_root_tree_sha1(new_sha1, "", &opt); 466 ret = diff_root_tree_sha1(new_sha1, "", &opt);
464 diffcore_std(&opt); 467 diffcore_std(&opt);
465 diff_flush(&opt); 468 diff_flush(&opt);
466} 469}
467 470
468void cgit_diff_commit(struct commit *commit, filepair_fn fn) 471void cgit_diff_commit(struct commit *commit, filepair_fn fn)
469{ 472{
470 unsigned char *old_sha1 = NULL; 473 unsigned char *old_sha1 = NULL;
471 474
472 if (commit->parents) 475 if (commit->parents)
473 old_sha1 = commit->parents->item->object.sha1; 476 old_sha1 = commit->parents->item->object.sha1;
474 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 477 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
475} 478}