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