summaryrefslogtreecommitdiffabout
path: root/shared.c
Unidiff
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index 19d2df0..f8a17b6 100644
--- a/shared.c
+++ b/shared.c
@@ -53,50 +53,50 @@ int htmlfd = 0;
53 53
54int chk_zero(int result, char *msg) 54int chk_zero(int result, char *msg)
55{ 55{
56 if (result != 0) 56 if (result != 0)
57 die("%s: %s", msg, strerror(errno)); 57 die("%s: %s", msg, strerror(errno));
58 return result; 58 return result;
59} 59}
60 60
61int chk_positive(int result, char *msg) 61int chk_positive(int result, char *msg)
62{ 62{
63 if (result <= 0) 63 if (result <= 0)
64 die("%s: %s", msg, strerror(errno)); 64 die("%s: %s", msg, strerror(errno));
65 return result; 65 return result;
66} 66}
67 67
68struct repoinfo *add_repo(const char *url) 68struct repoinfo *add_repo(const char *url)
69{ 69{
70 struct repoinfo *ret; 70 struct repoinfo *ret;
71 71
72 if (++cgit_repolist.count > cgit_repolist.length) { 72 if (++cgit_repolist.count > cgit_repolist.length) {
73 if (cgit_repolist.length == 0) 73 if (cgit_repolist.length == 0)
74 cgit_repolist.length = 8; 74 cgit_repolist.length = 8;
75 else 75 else
76 cgit_repolist.length *= 2; 76 cgit_repolist.length *= 2;
77 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 77 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
78 cgit_repolist.length * 78 cgit_repolist.length *
79 sizeof(struct repoinfo)); 79 sizeof(struct repoinfo));
80 } 80 }
81 81
82 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 82 ret = &cgit_repolist.repos[cgit_repolist.count-1];
83 ret->url = xstrdup(url); 83 ret->url = xstrdup(url);
84 ret->name = ret->url; 84 ret->name = ret->url;
85 ret->path = NULL; 85 ret->path = NULL;
86 ret->desc = NULL; 86 ret->desc = NULL;
87 ret->owner = NULL; 87 ret->owner = NULL;
88 ret->snapshots = cgit_snapshots; 88 ret->snapshots = cgit_snapshots;
89 ret->module_link = cgit_module_link; 89 ret->module_link = cgit_module_link;
90 return ret; 90 return ret;
91} 91}
92 92
93void cgit_global_config_cb(const char *name, const char *value) 93void cgit_global_config_cb(const char *name, const char *value)
94{ 94{
95 if (!strcmp(name, "root-title")) 95 if (!strcmp(name, "root-title"))
96 cgit_root_title = xstrdup(value); 96 cgit_root_title = xstrdup(value);
97 else if (!strcmp(name, "css")) 97 else if (!strcmp(name, "css"))
98 cgit_css = xstrdup(value); 98 cgit_css = xstrdup(value);
99 else if (!strcmp(name, "logo")) 99 else if (!strcmp(name, "logo"))
100 cgit_logo = xstrdup(value); 100 cgit_logo = xstrdup(value);
101 else if (!strcmp(name, "logo-link")) 101 else if (!strcmp(name, "logo-link"))
102 cgit_logo_link = xstrdup(value); 102 cgit_logo_link = xstrdup(value);
@@ -174,24 +174,67 @@ void cgit_querystring_cb(const char *name, const char *value)
174 174
175void *cgit_free_commitinfo(struct commitinfo *info) 175void *cgit_free_commitinfo(struct commitinfo *info)
176{ 176{
177 free(info->author); 177 free(info->author);
178 free(info->author_email); 178 free(info->author_email);
179 free(info->committer); 179 free(info->committer);
180 free(info->committer_email); 180 free(info->committer_email);
181 free(info->subject); 181 free(info->subject);
182 free(info); 182 free(info);
183 return NULL; 183 return NULL;
184} 184}
185 185
186int hextoint(char c) 186int hextoint(char c)
187{ 187{
188 if (c >= 'a' && c <= 'f') 188 if (c >= 'a' && c <= 'f')
189 return 10 + c - 'a'; 189 return 10 + c - 'a';
190 else if (c >= 'A' && c <= 'F') 190 else if (c >= 'A' && c <= 'F')
191 return 10 + c - 'A'; 191 return 10 + c - 'A';
192 else if (c >= '0' && c <= '9') 192 else if (c >= '0' && c <= '9')
193 return c - '0'; 193 return c - '0';
194 else 194 else
195 return -1; 195 return -1;
196} 196}
197 197
198void cgit_diff_tree_cb(struct diff_queue_struct *q,
199 struct diff_options *options, void *data)
200{
201 int i;
202
203 for (i = 0; i < q->nr; i++) {
204 if (q->queue[i]->status == 'U')
205 continue;
206 ((filepair_fn)data)(q->queue[i]);
207 }
208}
209
210void cgit_diff_tree(const unsigned char *old_sha1,
211 const unsigned char *new_sha1,
212 filepair_fn fn)
213{
214 struct diff_options opt;
215 int ret;
216
217 diff_setup(&opt);
218 opt.output_format = DIFF_FORMAT_CALLBACK;
219 opt.detect_rename = 1;
220 opt.recursive = 1;
221 opt.format_callback = cgit_diff_tree_cb;
222 opt.format_callback_data = fn;
223 diff_setup_done(&opt);
224
225 if (old_sha1)
226 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
227 else
228 ret = diff_root_tree_sha1(new_sha1, "", &opt);
229 diffcore_std(&opt);
230 diff_flush(&opt);
231}
232
233void cgit_diff_commit(struct commit *commit, filepair_fn fn)
234{
235 unsigned char *old_sha1 = NULL;
236
237 if (commit->parents)
238 old_sha1 = commit->parents->item->object.sha1;
239 cgit_diff_tree(old_sha1, commit->object.sha1, fn);
240}