|
diff --git a/cgit.h b/cgit.h index b7f8827..24b02d7 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -1,45 +1,46 @@ |
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 | typedef void (*configfn)(const char *name, const char *value); |
21 | typedef void (*configfn)(const char *name, const char *value); |
| |
22 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
22 | |
23 | |
23 | struct cacheitem { |
24 | struct cacheitem { |
24 | char *name; |
25 | char *name; |
25 | struct stat st; |
26 | struct stat st; |
26 | int ttl; |
27 | int ttl; |
27 | int fd; |
28 | int fd; |
28 | }; |
29 | }; |
29 | |
30 | |
30 | struct repoinfo { |
31 | struct repoinfo { |
31 | char *url; |
32 | char *url; |
32 | char *name; |
33 | char *name; |
33 | char *path; |
34 | char *path; |
34 | char *desc; |
35 | char *desc; |
35 | char *owner; |
36 | char *owner; |
36 | char *module_link; |
37 | char *module_link; |
37 | int snapshots; |
38 | int snapshots; |
38 | }; |
39 | }; |
39 | |
40 | |
40 | struct repolist { |
41 | struct repolist { |
41 | int length; |
42 | int length; |
42 | int count; |
43 | int count; |
43 | struct repoinfo *repos; |
44 | struct repoinfo *repos; |
44 | }; |
45 | }; |
45 | |
46 | |
@@ -95,48 +96,52 @@ extern int cgit_query_has_sha1; |
95 | |
96 | |
96 | extern char *cgit_querystring; |
97 | extern char *cgit_querystring; |
97 | extern char *cgit_query_repo; |
98 | extern char *cgit_query_repo; |
98 | extern char *cgit_query_page; |
99 | extern char *cgit_query_page; |
99 | extern char *cgit_query_search; |
100 | extern char *cgit_query_search; |
100 | extern char *cgit_query_head; |
101 | extern char *cgit_query_head; |
101 | extern char *cgit_query_sha1; |
102 | extern char *cgit_query_sha1; |
102 | extern char *cgit_query_sha2; |
103 | extern char *cgit_query_sha2; |
103 | extern char *cgit_query_path; |
104 | extern char *cgit_query_path; |
104 | extern char *cgit_query_name; |
105 | extern char *cgit_query_name; |
105 | extern int cgit_query_ofs; |
106 | extern int cgit_query_ofs; |
106 | |
107 | |
107 | extern int htmlfd; |
108 | extern int htmlfd; |
108 | |
109 | |
109 | extern void cgit_global_config_cb(const char *name, const char *value); |
110 | extern void cgit_global_config_cb(const char *name, const char *value); |
110 | extern void cgit_repo_config_cb(const char *name, const char *value); |
111 | extern void cgit_repo_config_cb(const char *name, const char *value); |
111 | extern void cgit_querystring_cb(const char *name, const char *value); |
112 | extern void cgit_querystring_cb(const char *name, const char *value); |
112 | |
113 | |
113 | extern int chk_zero(int result, char *msg); |
114 | extern int chk_zero(int result, char *msg); |
114 | extern int chk_positive(int result, char *msg); |
115 | extern int chk_positive(int result, char *msg); |
115 | |
116 | |
116 | extern int hextoint(char c); |
117 | extern int hextoint(char c); |
117 | |
118 | |
118 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
119 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
| |
120 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
| |
121 | const unsigned char *new_sha1, |
| |
122 | filepair_fn fn); |
| |
123 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
119 | |
124 | |
120 | extern char *fmt(const char *format,...); |
125 | extern char *fmt(const char *format,...); |
121 | |
126 | |
122 | extern void html(const char *txt); |
127 | extern void html(const char *txt); |
123 | extern void htmlf(const char *format,...); |
128 | extern void htmlf(const char *format,...); |
124 | extern void html_txt(char *txt); |
129 | extern void html_txt(char *txt); |
125 | extern void html_ntxt(int len, char *txt); |
130 | extern void html_ntxt(int len, char *txt); |
126 | extern void html_attr(char *txt); |
131 | extern void html_attr(char *txt); |
127 | extern void html_hidden(char *name, char *value); |
132 | extern void html_hidden(char *name, char *value); |
128 | extern void html_link_open(char *url, char *title, char *class); |
133 | extern void html_link_open(char *url, char *title, char *class); |
129 | extern void html_link_close(void); |
134 | extern void html_link_close(void); |
130 | extern void html_filemode(unsigned short mode); |
135 | extern void html_filemode(unsigned short mode); |
131 | |
136 | |
132 | extern int cgit_read_config(const char *filename, configfn fn); |
137 | extern int cgit_read_config(const char *filename, configfn fn); |
133 | extern int cgit_parse_query(char *txt, configfn fn); |
138 | extern int cgit_parse_query(char *txt, configfn fn); |
134 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
139 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
135 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
140 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
136 | |
141 | |
137 | extern char *cache_safe_filename(const char *unsafe); |
142 | extern char *cache_safe_filename(const char *unsafe); |
138 | extern int cache_lock(struct cacheitem *item); |
143 | extern int cache_lock(struct cacheitem *item); |
139 | extern int cache_unlock(struct cacheitem *item); |
144 | extern int cache_unlock(struct cacheitem *item); |
140 | extern int cache_cancel_lock(struct cacheitem *item); |
145 | extern int cache_cancel_lock(struct cacheitem *item); |
141 | extern int cache_exist(struct cacheitem *item); |
146 | extern int cache_exist(struct cacheitem *item); |
142 | extern int cache_expired(struct cacheitem *item); |
147 | extern int cache_expired(struct cacheitem *item); |
|
|
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 | |
54 | int chk_zero(int result, char *msg) |
54 | int 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 | |
61 | int chk_positive(int result, char *msg) |
61 | int 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 | |
68 | struct repoinfo *add_repo(const char *url) |
68 | struct 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 | |
93 | void cgit_global_config_cb(const char *name, const char *value) |
93 | void 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 | |
175 | void *cgit_free_commitinfo(struct commitinfo *info) |
175 | void *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 | |
186 | int hextoint(char c) |
186 | int 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 | |
| |
198 | void 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 | |
| |
210 | void 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 | |
| |
233 | void 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 | } |
|