author | Jonathan Bastien-Filiatrault <joe@x2a.org> | 2007-10-26 22:09:06 (UTC) |
---|---|---|
committer | Jonathan Bastien-Filiatrault <joe@x2a.org> | 2007-11-05 23:13:30 (UTC) |
commit | 3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b (patch) (unidiff) | |
tree | 548671b6339e9a1a252ded4d534f11bfcd560043 /parsing.c | |
parent | 72ede12551af320b6d8eade853dbd2cd6f2222cc (diff) | |
download | cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.zip cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.gz cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.bz2 |
Add commit->msg_encoding, allocate msg dynamicly.
-rw-r--r-- | parsing.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -138,128 +138,129 @@ int cgit_parse_query(char *txt, configfn fn) | |||
138 | * cmd: log | commit | diff | tree | view | blob | snapshot | 138 | * cmd: log | commit | diff | tree | view | blob | snapshot |
139 | * path: any valid path, may contain '/' | 139 | * path: any valid path, may contain '/' |
140 | * | 140 | * |
141 | */ | 141 | */ |
142 | void cgit_parse_url(const char *url) | 142 | void cgit_parse_url(const char *url) |
143 | { | 143 | { |
144 | char *cmd, *p; | 144 | char *cmd, *p; |
145 | 145 | ||
146 | cgit_repo = NULL; | 146 | cgit_repo = NULL; |
147 | if (!url || url[0] == '\0') | 147 | if (!url || url[0] == '\0') |
148 | return; | 148 | return; |
149 | 149 | ||
150 | cgit_repo = cgit_get_repoinfo(url); | 150 | cgit_repo = cgit_get_repoinfo(url); |
151 | if (cgit_repo) { | 151 | if (cgit_repo) { |
152 | cgit_query_repo = cgit_repo->url; | 152 | cgit_query_repo = cgit_repo->url; |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | cmd = strchr(url, '/'); | 156 | cmd = strchr(url, '/'); |
157 | while (!cgit_repo && cmd) { | 157 | while (!cgit_repo && cmd) { |
158 | cmd[0] = '\0'; | 158 | cmd[0] = '\0'; |
159 | cgit_repo = cgit_get_repoinfo(url); | 159 | cgit_repo = cgit_get_repoinfo(url); |
160 | if (cgit_repo == NULL) { | 160 | if (cgit_repo == NULL) { |
161 | cmd[0] = '/'; | 161 | cmd[0] = '/'; |
162 | cmd = strchr(cmd + 1, '/'); | 162 | cmd = strchr(cmd + 1, '/'); |
163 | continue; | 163 | continue; |
164 | } | 164 | } |
165 | 165 | ||
166 | cgit_query_repo = cgit_repo->url; | 166 | cgit_query_repo = cgit_repo->url; |
167 | p = strchr(cmd + 1, '/'); | 167 | p = strchr(cmd + 1, '/'); |
168 | if (p) { | 168 | if (p) { |
169 | p[0] = '\0'; | 169 | p[0] = '\0'; |
170 | if (p[1]) | 170 | if (p[1]) |
171 | cgit_query_path = trim_end(p + 1, '/'); | 171 | cgit_query_path = trim_end(p + 1, '/'); |
172 | } | 172 | } |
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | 173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
174 | cgit_query_page = xstrdup(cmd + 1); | 174 | cgit_query_page = xstrdup(cmd + 1); |
175 | return; | 175 | return; |
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
180 | { | 180 | { |
181 | char *buf; | 181 | char *buf; |
182 | 182 | ||
183 | buf = xmalloc(tail - head + 1); | 183 | buf = xmalloc(tail - head + 1); |
184 | strncpy(buf, head, tail - head); | 184 | strncpy(buf, head, tail - head); |
185 | buf[tail - head] = '\0'; | 185 | buf[tail - head] = '\0'; |
186 | return buf; | 186 | return buf; |
187 | } | 187 | } |
188 | 188 | ||
189 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
190 | { | 190 | { |
191 | struct commitinfo *ret; | 191 | struct commitinfo *ret; |
192 | char *p = commit->buffer, *t = commit->buffer; | 192 | char *p = commit->buffer, *t = commit->buffer; |
193 | 193 | ||
194 | ret = xmalloc(sizeof(*ret)); | 194 | ret = xmalloc(sizeof(*ret)); |
195 | ret->commit = commit; | 195 | ret->commit = commit; |
196 | ret->author = NULL; | 196 | ret->author = NULL; |
197 | ret->author_email = NULL; | 197 | ret->author_email = NULL; |
198 | ret->committer = NULL; | 198 | ret->committer = NULL; |
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | ret->msg_encoding = NULL; | ||
202 | 203 | ||
203 | if (p == NULL) | 204 | if (p == NULL) |
204 | return ret; | 205 | return ret; |
205 | 206 | ||
206 | if (strncmp(p, "tree ", 5)) | 207 | if (strncmp(p, "tree ", 5)) |
207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 208 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
208 | else | 209 | else |
209 | p += 46; // "tree " + hex[40] + "\n" | 210 | p += 46; // "tree " + hex[40] + "\n" |
210 | 211 | ||
211 | while (!strncmp(p, "parent ", 7)) | 212 | while (!strncmp(p, "parent ", 7)) |
212 | p += 48; // "parent " + hex[40] + "\n" | 213 | p += 48; // "parent " + hex[40] + "\n" |
213 | 214 | ||
214 | if (!strncmp(p, "author ", 7)) { | 215 | if (!strncmp(p, "author ", 7)) { |
215 | p += 7; | 216 | p += 7; |
216 | t = strchr(p, '<') - 1; | 217 | t = strchr(p, '<') - 1; |
217 | ret->author = substr(p, t); | 218 | ret->author = substr(p, t); |
218 | p = t; | 219 | p = t; |
219 | t = strchr(t, '>') + 1; | 220 | t = strchr(t, '>') + 1; |
220 | ret->author_email = substr(p, t); | 221 | ret->author_email = substr(p, t); |
221 | ret->author_date = atol(++t); | 222 | ret->author_date = atol(++t); |
222 | p = strchr(t, '\n') + 1; | 223 | p = strchr(t, '\n') + 1; |
223 | } | 224 | } |
224 | 225 | ||
225 | if (!strncmp(p, "committer ", 9)) { | 226 | if (!strncmp(p, "committer ", 9)) { |
226 | p += 9; | 227 | p += 9; |
227 | t = strchr(p, '<') - 1; | 228 | t = strchr(p, '<') - 1; |
228 | ret->committer = substr(p, t); | 229 | ret->committer = substr(p, t); |
229 | p = t; | 230 | p = t; |
230 | t = strchr(t, '>') + 1; | 231 | t = strchr(t, '>') + 1; |
231 | ret->committer_email = substr(p, t); | 232 | ret->committer_email = substr(p, t); |
232 | ret->committer_date = atol(++t); | 233 | ret->committer_date = atol(++t); |
233 | p = strchr(t, '\n') + 1; | 234 | p = strchr(t, '\n') + 1; |
234 | } | 235 | } |
235 | 236 | ||
236 | while (*p && (*p != '\n')) | 237 | while (*p && (*p != '\n')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 238 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 239 | ||
239 | while (*p == '\n') | 240 | while (*p == '\n') |
240 | p = strchr(p, '\n') + 1; | 241 | p = strchr(p, '\n') + 1; |
241 | 242 | ||
242 | t = strchr(p, '\n'); | 243 | t = strchr(p, '\n'); |
243 | if (t) { | 244 | if (t) { |
244 | if (*t == '\0') | 245 | if (*t == '\0') |
245 | ret->subject = "** empty **"; | 246 | ret->subject = "** empty **"; |
246 | else | 247 | else |
247 | ret->subject = substr(p, t); | 248 | ret->subject = substr(p, t); |
248 | p = t + 1; | 249 | p = t + 1; |
249 | 250 | ||
250 | while (*p == '\n') | 251 | while (*p == '\n') |
251 | p = strchr(p, '\n') + 1; | 252 | p = strchr(p, '\n') + 1; |
252 | ret->msg = xstrdup(p); | 253 | ret->msg = xstrdup(p); |
253 | } else | 254 | } else |
254 | ret->subject = substr(p, p+strlen(p)); | 255 | ret->subject = substr(p, p+strlen(p)); |
255 | 256 | ||
256 | return ret; | 257 | return ret; |
257 | } | 258 | } |
258 | 259 | ||
259 | 260 | ||
260 | struct taginfo *cgit_parse_tag(struct tag *tag) | 261 | struct taginfo *cgit_parse_tag(struct tag *tag) |
261 | { | 262 | { |
262 | void *data; | 263 | void *data; |
263 | enum object_type type; | 264 | enum object_type type; |
264 | unsigned long size; | 265 | unsigned long size; |
265 | char *p, *t; | 266 | char *p, *t; |