|
diff --git a/shared.c b/shared.c index 06f70bb..9f7d6a5 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -403,32 +403,103 @@ int cgit_close_filter(struct cgit_filter *filter) |
403 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
403 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
404 | return 0; |
404 | return 0; |
405 | die("Subprocess %s exited abnormally", filter->cmd); |
405 | die("Subprocess %s exited abnormally", filter->cmd); |
406 | } |
406 | } |
407 | |
407 | |
408 | /* Read the content of the specified file into a newly allocated buffer, |
408 | /* Read the content of the specified file into a newly allocated buffer, |
409 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
409 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
410 | */ |
410 | */ |
411 | int readfile(const char *path, char **buf, size_t *size) |
411 | int readfile(const char *path, char **buf, size_t *size) |
412 | { |
412 | { |
413 | int fd, e; |
413 | int fd, e; |
414 | struct stat st; |
414 | struct stat st; |
415 | |
415 | |
416 | fd = open(path, O_RDONLY); |
416 | fd = open(path, O_RDONLY); |
417 | if (fd == -1) |
417 | if (fd == -1) |
418 | return errno; |
418 | return errno; |
419 | if (fstat(fd, &st)) { |
419 | if (fstat(fd, &st)) { |
420 | e = errno; |
420 | e = errno; |
421 | close(fd); |
421 | close(fd); |
422 | return e; |
422 | return e; |
423 | } |
423 | } |
424 | if (!S_ISREG(st.st_mode)) { |
424 | if (!S_ISREG(st.st_mode)) { |
425 | close(fd); |
425 | close(fd); |
426 | return EISDIR; |
426 | return EISDIR; |
427 | } |
427 | } |
428 | *buf = xmalloc(st.st_size + 1); |
428 | *buf = xmalloc(st.st_size + 1); |
429 | *size = read_in_full(fd, *buf, st.st_size); |
429 | *size = read_in_full(fd, *buf, st.st_size); |
430 | e = errno; |
430 | e = errno; |
431 | (*buf)[*size] = '\0'; |
431 | (*buf)[*size] = '\0'; |
432 | close(fd); |
432 | close(fd); |
433 | return (*size == st.st_size ? 0 : e); |
433 | return (*size == st.st_size ? 0 : e); |
434 | } |
434 | } |
| |
435 | |
| |
436 | int is_token_char(char c) |
| |
437 | { |
| |
438 | return isalnum(c) || c == '_'; |
| |
439 | } |
| |
440 | |
| |
441 | /* Replace name with getenv(name), return pointer to zero-terminating char |
| |
442 | */ |
| |
443 | char *expand_macro(char *name, int maxlength) |
| |
444 | { |
| |
445 | char *value; |
| |
446 | int len; |
| |
447 | |
| |
448 | len = 0; |
| |
449 | value = getenv(name); |
| |
450 | if (value) { |
| |
451 | len = strlen(value); |
| |
452 | if (len > maxlength) |
| |
453 | len = maxlength; |
| |
454 | strncpy(name, value, len); |
| |
455 | } |
| |
456 | return name + len; |
| |
457 | } |
| |
458 | |
| |
459 | #define EXPBUFSIZE (1024 * 8) |
| |
460 | |
| |
461 | /* Replace all tokens prefixed by '$' in the specified text with the |
| |
462 | * value of the named environment variable. |
| |
463 | * NB: the return value is a static buffer, i.e. it must be strdup'd |
| |
464 | * by the caller. |
| |
465 | */ |
| |
466 | char *expand_macros(const char *txt) |
| |
467 | { |
| |
468 | static char result[EXPBUFSIZE]; |
| |
469 | char *p, *start; |
| |
470 | int len; |
| |
471 | |
| |
472 | p = result; |
| |
473 | start = NULL; |
| |
474 | while (p < result + EXPBUFSIZE - 1 && txt && *txt) { |
| |
475 | *p = *txt; |
| |
476 | if (start) { |
| |
477 | if (!is_token_char(*txt)) { |
| |
478 | if (p - start > 0) { |
| |
479 | *p = '\0'; |
| |
480 | len = result + EXPBUFSIZE - start - 1; |
| |
481 | p = expand_macro(start, len) - 1; |
| |
482 | } |
| |
483 | start = NULL; |
| |
484 | txt--; |
| |
485 | } |
| |
486 | p++; |
| |
487 | txt++; |
| |
488 | continue; |
| |
489 | } |
| |
490 | if (*txt == '$') { |
| |
491 | start = p; |
| |
492 | txt++; |
| |
493 | continue; |
| |
494 | } |
| |
495 | p++; |
| |
496 | txt++; |
| |
497 | } |
| |
498 | *p = '\0'; |
| |
499 | if (start && p - start > 0) { |
| |
500 | len = result + EXPBUFSIZE - start - 1; |
| |
501 | p = expand_macro(start, len); |
| |
502 | *p = '\0'; |
| |
503 | } |
| |
504 | return result; |
| |
505 | } |
|