|
diff --git a/cgit.h b/cgit.h index b6b60c6..f06a941 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -1,69 +1,73 @@ |
1 | #ifndef CGIT_H |
1 | #ifndef CGIT_H |
2 | #define CGIT_H |
2 | #define CGIT_H |
3 | |
3 | |
4 | #include "git.h" |
4 | #include "git.h" |
5 | #include <openssl/sha.h> |
5 | #include <openssl/sha.h> |
6 | #include <ctype.h> |
6 | #include <ctype.h> |
7 | #include <sched.h> |
7 | #include <sched.h> |
8 | |
8 | |
9 | typedef void (*configfn)(const char *name, const char *value); |
9 | typedef void (*configfn)(const char *name, const char *value); |
10 | |
10 | |
11 | struct cacheitem { |
11 | struct cacheitem { |
12 | char *name; |
12 | char *name; |
13 | struct stat st; |
13 | struct stat st; |
14 | int ttl; |
14 | int ttl; |
15 | int fd; |
15 | int fd; |
16 | }; |
16 | }; |
17 | |
17 | |
18 | struct commitinfo { |
18 | struct commitinfo { |
19 | struct commit *commit; |
19 | struct commit *commit; |
20 | char *author; |
20 | char *author; |
| |
21 | char *author_email; |
| |
22 | unsigned long author_date; |
21 | char *committer; |
23 | char *committer; |
| |
24 | char *committer_email; |
| |
25 | unsigned long committer_date; |
22 | char *subject; |
26 | char *subject; |
23 | char *msg; |
27 | char *msg; |
24 | }; |
28 | }; |
25 | |
29 | |
26 | extern const char cgit_version[]; |
30 | extern const char cgit_version[]; |
27 | |
31 | |
28 | extern char *cgit_root; |
32 | extern char *cgit_root; |
29 | extern char *cgit_root_title; |
33 | extern char *cgit_root_title; |
30 | extern char *cgit_css; |
34 | extern char *cgit_css; |
31 | extern char *cgit_logo; |
35 | extern char *cgit_logo; |
32 | extern char *cgit_logo_link; |
36 | extern char *cgit_logo_link; |
33 | extern char *cgit_virtual_root; |
37 | extern char *cgit_virtual_root; |
34 | extern char *cgit_cache_root; |
38 | extern char *cgit_cache_root; |
35 | |
39 | |
36 | extern int cgit_nocache; |
40 | extern int cgit_nocache; |
37 | extern int cgit_max_lock_attempts; |
41 | extern int cgit_max_lock_attempts; |
38 | extern int cgit_cache_root_ttl; |
42 | extern int cgit_cache_root_ttl; |
39 | extern int cgit_cache_repo_ttl; |
43 | extern int cgit_cache_repo_ttl; |
40 | extern int cgit_cache_dynamic_ttl; |
44 | extern int cgit_cache_dynamic_ttl; |
41 | extern int cgit_cache_static_ttl; |
45 | extern int cgit_cache_static_ttl; |
42 | extern int cgit_cache_max_create_time; |
46 | extern int cgit_cache_max_create_time; |
43 | |
47 | |
44 | extern char *cgit_repo_name; |
48 | extern char *cgit_repo_name; |
45 | extern char *cgit_repo_desc; |
49 | extern char *cgit_repo_desc; |
46 | extern char *cgit_repo_owner; |
50 | extern char *cgit_repo_owner; |
47 | |
51 | |
48 | extern int cgit_query_has_symref; |
52 | extern int cgit_query_has_symref; |
49 | extern int cgit_query_has_sha1; |
53 | extern int cgit_query_has_sha1; |
50 | |
54 | |
51 | extern char *cgit_querystring; |
55 | extern char *cgit_querystring; |
52 | extern char *cgit_query_repo; |
56 | extern char *cgit_query_repo; |
53 | extern char *cgit_query_page; |
57 | extern char *cgit_query_page; |
54 | extern char *cgit_query_head; |
58 | extern char *cgit_query_head; |
55 | extern char *cgit_query_sha1; |
59 | extern char *cgit_query_sha1; |
56 | extern int cgit_query_ofs; |
60 | extern int cgit_query_ofs; |
57 | |
61 | |
58 | extern int htmlfd; |
62 | extern int htmlfd; |
59 | |
63 | |
60 | extern void cgit_global_config_cb(const char *name, const char *value); |
64 | extern void cgit_global_config_cb(const char *name, const char *value); |
61 | extern void cgit_repo_config_cb(const char *name, const char *value); |
65 | extern void cgit_repo_config_cb(const char *name, const char *value); |
62 | extern void cgit_querystring_cb(const char *name, const char *value); |
66 | extern void cgit_querystring_cb(const char *name, const char *value); |
63 | |
67 | |
64 | extern char *fmt(const char *format,...); |
68 | extern char *fmt(const char *format,...); |
65 | |
69 | |
66 | extern void html(const char *txt); |
70 | extern void html(const char *txt); |
67 | extern void htmlf(const char *format,...); |
71 | extern void htmlf(const char *format,...); |
68 | extern void html_txt(char *txt); |
72 | extern void html_txt(char *txt); |
69 | extern void html_attr(char *txt); |
73 | extern void html_attr(char *txt); |
|
|
diff --git a/parsing.c b/parsing.c index be471b5..4d5cc74 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -90,71 +90,79 @@ int cgit_parse_query(char *txt, configfn fn) |
90 | |
90 | |
91 | while((c=*t) != '\0') { |
91 | while((c=*t) != '\0') { |
92 | if (c=='=') { |
92 | if (c=='=') { |
93 | *t = '\0'; |
93 | *t = '\0'; |
94 | value = t+1; |
94 | value = t+1; |
95 | } else if (c=='&') { |
95 | } else if (c=='&') { |
96 | *t = '\0'; |
96 | *t = '\0'; |
97 | (*fn)(txt, value); |
97 | (*fn)(txt, value); |
98 | txt = t+1; |
98 | txt = t+1; |
99 | value = NULL; |
99 | value = NULL; |
100 | } |
100 | } |
101 | t++; |
101 | t++; |
102 | } |
102 | } |
103 | if (t!=txt) |
103 | if (t!=txt) |
104 | (*fn)(txt, value); |
104 | (*fn)(txt, value); |
105 | return 0; |
105 | return 0; |
106 | } |
106 | } |
107 | |
107 | |
108 | char *substr(const char *head, const char *tail) |
108 | char *substr(const char *head, const char *tail) |
109 | { |
109 | { |
110 | char *buf; |
110 | char *buf; |
111 | |
111 | |
112 | buf = xmalloc(tail - head + 1); |
112 | buf = xmalloc(tail - head + 1); |
113 | strncpy(buf, head, tail - head); |
113 | strncpy(buf, head, tail - head); |
114 | buf[tail - head] = '\0'; |
114 | buf[tail - head] = '\0'; |
115 | return buf; |
115 | return buf; |
116 | } |
116 | } |
117 | |
117 | |
118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
119 | { |
119 | { |
120 | struct commitinfo *ret; |
120 | struct commitinfo *ret; |
121 | char *p = commit->buffer, *t = commit->buffer; |
121 | char *p = commit->buffer, *t = commit->buffer; |
122 | |
122 | |
123 | ret = xmalloc(sizeof(*ret)); |
123 | ret = xmalloc(sizeof(*ret)); |
124 | ret->commit = commit; |
124 | ret->commit = commit; |
125 | |
125 | |
126 | if (strncmp(p, "tree ", 5)) |
126 | if (strncmp(p, "tree ", 5)) |
127 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
127 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
128 | else |
128 | else |
129 | p += 46; // "tree " + hex[40] + "\n" |
129 | p += 46; // "tree " + hex[40] + "\n" |
130 | |
130 | |
131 | while (!strncmp(p, "parent ", 7)) |
131 | while (!strncmp(p, "parent ", 7)) |
132 | p += 48; // "parent " + hex[40] + "\n" |
132 | p += 48; // "parent " + hex[40] + "\n" |
133 | |
133 | |
134 | if (!strncmp(p, "author ", 7)) { |
134 | if (!strncmp(p, "author ", 7)) { |
135 | p += 7; |
135 | p += 7; |
136 | t = strchr(p, '<') - 1; |
136 | t = strchr(p, '<') - 1; |
137 | ret->author = substr(p, t); |
137 | ret->author = substr(p, t); |
138 | p = strchr(p, '\n') + 1; |
138 | p = t; |
| |
139 | t = strchr(t, '>') + 1; |
| |
140 | ret->author_email = substr(p, t); |
| |
141 | ret->author_date = atol(++t); |
| |
142 | p = strchr(t, '\n') + 1; |
139 | } |
143 | } |
140 | |
144 | |
141 | if (!strncmp(p, "committer ", 9)) { |
145 | if (!strncmp(p, "committer ", 9)) { |
142 | p += 9; |
146 | p += 9; |
143 | t = strchr(p, '<') - 1; |
147 | t = strchr(p, '<') - 1; |
144 | ret->committer = substr(p, t); |
148 | ret->committer = substr(p, t); |
145 | p = strchr(p, '\n') + 1; |
149 | p = t; |
| |
150 | t = strchr(t, '>') + 1; |
| |
151 | ret->committer_email = substr(p, t); |
| |
152 | ret->committer_date = atol(++t); |
| |
153 | p = strchr(t, '\n') + 1; |
146 | } |
154 | } |
147 | |
155 | |
148 | while (*p == '\n') |
156 | while (*p == '\n') |
149 | p = strchr(p, '\n') + 1; |
157 | p = strchr(p, '\n') + 1; |
150 | |
158 | |
151 | t = strchr(p, '\n'); |
159 | t = strchr(p, '\n'); |
152 | ret->subject = substr(p, t); |
160 | ret->subject = substr(p, t); |
153 | p = t + 1; |
161 | p = t + 1; |
154 | |
162 | |
155 | while (*p == '\n') |
163 | while (*p == '\n') |
156 | p = strchr(p, '\n') + 1; |
164 | p = strchr(p, '\n') + 1; |
157 | ret->msg = p; |
165 | ret->msg = p; |
158 | |
166 | |
159 | return ret; |
167 | return ret; |
160 | } |
168 | } |
|