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