-rw-r--r-- | html.c | 9 | ||||
-rwxr-xr-x | tests/t0108-patch.sh | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -239,77 +239,78 @@ void html_fileperm(unsigned short mode) | |||
239 | 239 | ||
240 | int html_include(const char *filename) | 240 | int html_include(const char *filename) |
241 | { | 241 | { |
242 | FILE *f; | 242 | FILE *f; |
243 | char buf[4096]; | 243 | char buf[4096]; |
244 | size_t len; | 244 | size_t len; |
245 | 245 | ||
246 | if (!(f = fopen(filename, "r"))) { | 246 | if (!(f = fopen(filename, "r"))) { |
247 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", | 247 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", |
248 | filename, strerror(errno), errno); | 248 | filename, strerror(errno), errno); |
249 | return -1; | 249 | return -1; |
250 | } | 250 | } |
251 | while((len = fread(buf, 1, 4096, f)) > 0) | 251 | while((len = fread(buf, 1, 4096, f)) > 0) |
252 | write(htmlfd, buf, len); | 252 | write(htmlfd, buf, len); |
253 | fclose(f); | 253 | fclose(f); |
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | 256 | ||
257 | int hextoint(char c) | 257 | int hextoint(char c) |
258 | { | 258 | { |
259 | if (c >= 'a' && c <= 'f') | 259 | if (c >= 'a' && c <= 'f') |
260 | return 10 + c - 'a'; | 260 | return 10 + c - 'a'; |
261 | else if (c >= 'A' && c <= 'F') | 261 | else if (c >= 'A' && c <= 'F') |
262 | return 10 + c - 'A'; | 262 | return 10 + c - 'A'; |
263 | else if (c >= '0' && c <= '9') | 263 | else if (c >= '0' && c <= '9') |
264 | return c - '0'; | 264 | return c - '0'; |
265 | else | 265 | else |
266 | return -1; | 266 | return -1; |
267 | } | 267 | } |
268 | 268 | ||
269 | char *convert_query_hexchar(char *txt) | 269 | char *convert_query_hexchar(char *txt) |
270 | { | 270 | { |
271 | int d1, d2; | 271 | int d1, d2, n; |
272 | if (strlen(txt) < 3) { | 272 | n = strlen(txt); |
273 | if (n < 3) { | ||
273 | *txt = '\0'; | 274 | *txt = '\0'; |
274 | return txt-1; | 275 | return txt-1; |
275 | } | 276 | } |
276 | d1 = hextoint(*(txt+1)); | 277 | d1 = hextoint(*(txt+1)); |
277 | d2 = hextoint(*(txt+2)); | 278 | d2 = hextoint(*(txt+2)); |
278 | if (d1<0 || d2<0) { | 279 | if (d1<0 || d2<0) { |
279 | strcpy(txt, txt+3); | 280 | memmove(txt, txt+3, n-3); |
280 | return txt-1; | 281 | return txt-1; |
281 | } else { | 282 | } else { |
282 | *txt = d1 * 16 + d2; | 283 | *txt = d1 * 16 + d2; |
283 | strcpy(txt+1, txt+3); | 284 | memmove(txt+1, txt+3, n-2); |
284 | return txt; | 285 | return txt; |
285 | } | 286 | } |
286 | } | 287 | } |
287 | 288 | ||
288 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) | 289 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
289 | { | 290 | { |
290 | char *t, *txt, *value = NULL, c; | 291 | char *t, *txt, *value = NULL, c; |
291 | 292 | ||
292 | if (!txt_) | 293 | if (!txt_) |
293 | return 0; | 294 | return 0; |
294 | 295 | ||
295 | t = txt = strdup(txt_); | 296 | t = txt = strdup(txt_); |
296 | if (t == NULL) { | 297 | if (t == NULL) { |
297 | printf("Out of memory\n"); | 298 | printf("Out of memory\n"); |
298 | exit(1); | 299 | exit(1); |
299 | } | 300 | } |
300 | while((c=*t) != '\0') { | 301 | while((c=*t) != '\0') { |
301 | if (c=='=') { | 302 | if (c=='=') { |
302 | *t = '\0'; | 303 | *t = '\0'; |
303 | value = t+1; | 304 | value = t+1; |
304 | } else if (c=='+') { | 305 | } else if (c=='+') { |
305 | *t = ' '; | 306 | *t = ' '; |
306 | } else if (c=='%') { | 307 | } else if (c=='%') { |
307 | t = convert_query_hexchar(t); | 308 | t = convert_query_hexchar(t); |
308 | } else if (c=='&') { | 309 | } else if (c=='&') { |
309 | *t = '\0'; | 310 | *t = '\0'; |
310 | (*fn)(txt, value); | 311 | (*fn)(txt, value); |
311 | txt = t+1; | 312 | txt = t+1; |
312 | value = NULL; | 313 | value = NULL; |
313 | } | 314 | } |
314 | t++; | 315 | t++; |
315 | } | 316 | } |
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index 33351d6..e608104 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh | |||
@@ -6,32 +6,34 @@ prepare_tests "Check content on patch page" | |||
6 | 6 | ||
7 | run_test 'generate foo/patch' ' | 7 | run_test 'generate foo/patch' ' |
8 | cgit_query "url=foo/patch" >trash/tmp | 8 | cgit_query "url=foo/patch" >trash/tmp |
9 | ' | 9 | ' |
10 | 10 | ||
11 | run_test 'find `From:` line' ' | 11 | run_test 'find `From:` line' ' |
12 | grep -e "^From: " trash/tmp | 12 | grep -e "^From: " trash/tmp |
13 | ' | 13 | ' |
14 | 14 | ||
15 | run_test 'find `Date:` line' ' | 15 | run_test 'find `Date:` line' ' |
16 | grep -e "^Date: " trash/tmp | 16 | grep -e "^Date: " trash/tmp |
17 | ' | 17 | ' |
18 | 18 | ||
19 | run_test 'find `Subject:` line' ' | 19 | run_test 'find `Subject:` line' ' |
20 | grep -e "^Subject: commit 5" trash/tmp | 20 | grep -e "^Subject: commit 5" trash/tmp |
21 | ' | 21 | ' |
22 | 22 | ||
23 | run_test 'find `cgit` signature' ' | 23 | run_test 'find `cgit` signature' ' |
24 | tail -1 trash/tmp | grep -e "^cgit" | 24 | tail -1 trash/tmp | grep -e "^cgit" |
25 | ' | 25 | ' |
26 | 26 | ||
27 | run_test 'find initial commit' ' | 27 | run_test 'find initial commit' ' |
28 | root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) | 28 | root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) |
29 | ' | 29 | ' |
30 | 30 | ||
31 | run_test 'generate patch for initial commit' ' | 31 | run_test 'generate patch for initial commit' ' |
32 | cgit_query "url=foo/patch&id=$root" >trash/tmp | 32 | cgit_query "url=foo/patch&id=$root" >trash/tmp |
33 | ' | 33 | ' |
34 | 34 | ||
35 | run_test 'find `cgit` signature' ' | 35 | run_test 'find `cgit` signature' ' |
36 | tail -1 trash/tmp | grep -e "^cgit" | 36 | tail -1 trash/tmp | grep -e "^cgit" |
37 | ' | 37 | ' |
38 | |||
39 | tests_done | ||