author | Lars Hjemli <hjemli@gmail.com> | 2010-03-21 23:09:43 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-03-21 23:09:43 (UTC) |
commit | ba56a37e863d0f90e3e953047486905cfb959925 (patch) (unidiff) | |
tree | 965e2c917f472264de35125eec35c361984eba4f /shared.c | |
parent | ff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff) | |
download | cgit-ba56a37e863d0f90e3e953047486905cfb959925.zip cgit-ba56a37e863d0f90e3e953047486905cfb959925.tar.gz cgit-ba56a37e863d0f90e3e953047486905cfb959925.tar.bz2 |
Add support for environment variable expansion
This patch teaches cgit to expand environment variables in certain
cgitrc option values (cache_root, scan-path, include) plus when
finding the location of cgitrc itself.
One use case for this feature is virtual hosting - e.g. by setting
$CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual
hosts automatically gets their own cgitrc.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 71 |
1 files changed, 71 insertions, 0 deletions
@@ -378,48 +378,119 @@ int cgit_open_filter(struct cgit_filter *filter) | |||
378 | } | 378 | } |
379 | close(filter->pipe_fh[0]); | 379 | close(filter->pipe_fh[0]); |
380 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), | 380 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
381 | "Unable to use pipe as STDOUT"); | 381 | "Unable to use pipe as STDOUT"); |
382 | close(filter->pipe_fh[1]); | 382 | close(filter->pipe_fh[1]); |
383 | return 0; | 383 | return 0; |
384 | } | 384 | } |
385 | 385 | ||
386 | int cgit_close_filter(struct cgit_filter *filter) | 386 | int cgit_close_filter(struct cgit_filter *filter) |
387 | { | 387 | { |
388 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | 388 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
389 | "Unable to restore STDOUT"); | 389 | "Unable to restore STDOUT"); |
390 | close(filter->old_stdout); | 390 | close(filter->old_stdout); |
391 | if (filter->pid < 0) | 391 | if (filter->pid < 0) |
392 | return 0; | 392 | return 0; |
393 | waitpid(filter->pid, &filter->exitstatus, 0); | 393 | waitpid(filter->pid, &filter->exitstatus, 0); |
394 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | 394 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
395 | return 0; | 395 | return 0; |
396 | die("Subprocess %s exited abnormally", filter->cmd); | 396 | die("Subprocess %s exited abnormally", filter->cmd); |
397 | } | 397 | } |
398 | 398 | ||
399 | /* Read the content of the specified file into a newly allocated buffer, | 399 | /* Read the content of the specified file into a newly allocated buffer, |
400 | * zeroterminate the buffer and return 0 on success, errno otherwise. | 400 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
401 | */ | 401 | */ |
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 | } | ||