author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
commit | 5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff) | |
tree | 823678b1c4a907cf0df50067c27fb5b752114df5 /cgit.h | |
parent | 0b3c746ba80738dbe0885a21406409390936537c (diff) | |
parent | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff) | |
download | cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2 |
Merge branch 'lh/binary'
-rw-r--r-- | cgit.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,65 +1,66 @@ | |||
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-interface.h> | ||
18 | #include <xdiff/xdiff.h> | 19 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 20 | #include <utf8.h> |
20 | 21 | ||
21 | 22 | ||
22 | /* | 23 | /* |
23 | * Dateformats used on misc. pages | 24 | * Dateformats used on misc. pages |
24 | */ | 25 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 26 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 27 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 28 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
28 | 29 | ||
29 | 30 | ||
30 | /* | 31 | /* |
31 | * Limits used for relative dates | 32 | * Limits used for relative dates |
32 | */ | 33 | */ |
33 | #define TM_MIN 60 | 34 | #define TM_MIN 60 |
34 | #define TM_HOUR (TM_MIN * 60) | 35 | #define TM_HOUR (TM_MIN * 60) |
35 | #define TM_DAY (TM_HOUR * 24) | 36 | #define TM_DAY (TM_HOUR * 24) |
36 | #define TM_WEEK (TM_DAY * 7) | 37 | #define TM_WEEK (TM_DAY * 7) |
37 | #define TM_YEAR (TM_DAY * 365) | 38 | #define TM_YEAR (TM_DAY * 365) |
38 | #define TM_MONTH (TM_YEAR / 12.0) | 39 | #define TM_MONTH (TM_YEAR / 12.0) |
39 | 40 | ||
40 | 41 | ||
41 | /* | 42 | /* |
42 | * Default encoding | 43 | * Default encoding |
43 | */ | 44 | */ |
44 | #define PAGE_ENCODING "UTF-8" | 45 | #define PAGE_ENCODING "UTF-8" |
45 | 46 | ||
46 | typedef void (*configfn)(const char *name, const char *value); | 47 | typedef void (*configfn)(const char *name, const char *value); |
47 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 48 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
48 | typedef void (*linediff_fn)(char *line, int len); | 49 | typedef void (*linediff_fn)(char *line, int len); |
49 | 50 | ||
50 | struct cgit_repo { | 51 | struct cgit_repo { |
51 | char *url; | 52 | char *url; |
52 | char *name; | 53 | char *name; |
53 | char *path; | 54 | char *path; |
54 | char *desc; | 55 | char *desc; |
55 | char *owner; | 56 | char *owner; |
56 | char *defbranch; | 57 | char *defbranch; |
57 | char *group; | 58 | char *group; |
58 | char *module_link; | 59 | char *module_link; |
59 | char *readme; | 60 | char *readme; |
60 | char *clone_url; | 61 | char *clone_url; |
61 | int snapshots; | 62 | int snapshots; |
62 | int enable_log_filecount; | 63 | int enable_log_filecount; |
63 | int enable_log_linecount; | 64 | int enable_log_linecount; |
64 | int max_stats; | 65 | int max_stats; |
65 | time_t mtime; | 66 | time_t mtime; |
@@ -177,68 +178,69 @@ struct cgit_page { | |||
177 | time_t expires; | 178 | time_t expires; |
178 | size_t size; | 179 | size_t size; |
179 | char *mimetype; | 180 | char *mimetype; |
180 | char *charset; | 181 | char *charset; |
181 | char *filename; | 182 | char *filename; |
182 | char *title; | 183 | char *title; |
183 | }; | 184 | }; |
184 | 185 | ||
185 | struct cgit_context { | 186 | struct cgit_context { |
186 | struct cgit_query qry; | 187 | struct cgit_query qry; |
187 | struct cgit_config cfg; | 188 | struct cgit_config cfg; |
188 | struct cgit_repo *repo; | 189 | struct cgit_repo *repo; |
189 | struct cgit_page page; | 190 | struct cgit_page page; |
190 | }; | 191 | }; |
191 | 192 | ||
192 | struct cgit_snapshot_format { | 193 | struct cgit_snapshot_format { |
193 | const char *suffix; | 194 | const char *suffix; |
194 | const char *mimetype; | 195 | const char *mimetype; |
195 | write_archive_fn_t write_func; | 196 | write_archive_fn_t write_func; |
196 | int bit; | 197 | int bit; |
197 | }; | 198 | }; |
198 | 199 | ||
199 | extern const char *cgit_version; | 200 | extern const char *cgit_version; |
200 | 201 | ||
201 | extern struct cgit_repolist cgit_repolist; | 202 | extern struct cgit_repolist cgit_repolist; |
202 | extern struct cgit_context ctx; | 203 | extern struct cgit_context ctx; |
203 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 204 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
204 | 205 | ||
205 | extern struct cgit_repo *cgit_add_repo(const char *url); | 206 | extern struct cgit_repo *cgit_add_repo(const char *url); |
206 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 207 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
207 | extern void cgit_repo_config_cb(const char *name, const char *value); | 208 | extern void cgit_repo_config_cb(const char *name, const char *value); |
208 | 209 | ||
209 | extern int chk_zero(int result, char *msg); | 210 | extern int chk_zero(int result, char *msg); |
210 | extern int chk_positive(int result, char *msg); | 211 | extern int chk_positive(int result, char *msg); |
211 | extern int chk_non_negative(int result, char *msg); | 212 | extern int chk_non_negative(int result, char *msg); |
212 | 213 | ||
213 | extern char *trim_end(const char *str, char c); | 214 | extern char *trim_end(const char *str, char c); |
214 | extern char *strlpart(char *txt, int maxlen); | 215 | extern char *strlpart(char *txt, int maxlen); |
215 | extern char *strrpart(char *txt, int maxlen); | 216 | extern char *strrpart(char *txt, int maxlen); |
216 | 217 | ||
217 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 218 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
218 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 219 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
219 | int flags, void *cb_data); | 220 | int flags, void *cb_data); |
220 | 221 | ||
221 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 222 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
222 | 223 | ||
223 | extern int cgit_diff_files(const unsigned char *old_sha1, | 224 | extern int cgit_diff_files(const unsigned char *old_sha1, |
224 | const unsigned char *new_sha1, | 225 | const unsigned char *new_sha1, |
225 | linediff_fn fn); | 226 | unsigned long *old_size, unsigned long *new_size, |
227 | int *binary, linediff_fn fn); | ||
226 | 228 | ||
227 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 229 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
228 | const unsigned char *new_sha1, | 230 | const unsigned char *new_sha1, |
229 | filepair_fn fn, const char *prefix); | 231 | filepair_fn fn, const char *prefix); |
230 | 232 | ||
231 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 233 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
232 | 234 | ||
233 | extern char *fmt(const char *format,...); | 235 | extern char *fmt(const char *format,...); |
234 | 236 | ||
235 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 237 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
236 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 238 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
237 | extern void cgit_parse_url(const char *url); | 239 | extern void cgit_parse_url(const char *url); |
238 | 240 | ||
239 | extern const char *cgit_repobasename(const char *reponame); | 241 | extern const char *cgit_repobasename(const char *reponame); |
240 | 242 | ||
241 | extern int cgit_parse_snapshots_mask(const char *str); | 243 | extern int cgit_parse_snapshots_mask(const char *str); |
242 | 244 | ||
243 | 245 | ||
244 | #endif /* CGIT_H */ | 246 | #endif /* CGIT_H */ |