about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2010-03-22 00:09:43 +0100
committerLars Hjemli2010-03-22 00:09:43 +0100
commitba56a37e863d0f90e3e953047486905cfb959925 (patch)
tree965e2c917f472264de35125eec35c361984eba4f
parentui-tree: add link to plain view for blobs in tree listing (diff)
downloadcgit-ba56a37e863d0f90e3e953047486905cfb959925.tar.gz
cgit-ba56a37e863d0f90e3e953047486905cfb959925.zip
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--cgit.c10
-rw-r--r--cgit.h2
-rw-r--r--shared.c71
3 files changed, 78 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c index 9305d0a..37154e3 100644 --- a/cgit.c +++ b/cgit.c
@@ -148,7 +148,7 @@ void config_cb(const char *name, const char *value)
148 else if (!strcmp(name, "cache-size")) 148 else if (!strcmp(name, "cache-size"))
149 ctx.cfg.cache_size = atoi(value); 149 ctx.cfg.cache_size = atoi(value);
150 else if (!strcmp(name, "cache-root")) 150 else if (!strcmp(name, "cache-root"))
151 ctx.cfg.cache_root = xstrdup(value); 151 ctx.cfg.cache_root = xstrdup(expand_macros(value));
152 else if (!strcmp(name, "cache-root-ttl")) 152 else if (!strcmp(name, "cache-root-ttl"))
153 ctx.cfg.cache_root_ttl = atoi(value); 153 ctx.cfg.cache_root_ttl = atoi(value);
154 else if (!strcmp(name, "cache-repo-ttl")) 154 else if (!strcmp(name, "cache-repo-ttl"))
@@ -177,9 +177,9 @@ void config_cb(const char *name, const char *value)
177 ctx.cfg.max_commit_count = atoi(value); 177 ctx.cfg.max_commit_count = atoi(value);
178 else if (!strcmp(name, "scan-path")) 178 else if (!strcmp(name, "scan-path"))
179 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 179 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
180 process_cached_repolist(value); 180 process_cached_repolist(expand_macros(value));
181 else 181 else
182 scan_tree(value, repo_config); 182 scan_tree(expand_macros(value), repo_config);
183 else if (!strcmp(name, "source-filter")) 183 else if (!strcmp(name, "source-filter"))
184 ctx.cfg.source_filter = new_filter(value, 1); 184 ctx.cfg.source_filter = new_filter(value, 1);
185 else if (!strcmp(name, "summary-log")) 185 else if (!strcmp(name, "summary-log"))
@@ -203,7 +203,7 @@ void config_cb(const char *name, const char *value)
203 else if (!prefixcmp(name, "mimetype.")) 203 else if (!prefixcmp(name, "mimetype."))
204 add_mimetype(name + 9, value); 204 add_mimetype(name + 9, value);
205 else if (!strcmp(name, "include")) 205 else if (!strcmp(name, "include"))
206 parse_configfile(value, config_cb); 206 parse_configfile(expand_macros(value), config_cb);
207} 207}
208 208
209static void querystring_cb(const char *name, const char *value) 209static void querystring_cb(const char *name, const char *value)
@@ -688,7 +688,7 @@ int main(int argc, const char **argv)
688 cgit_repolist.repos = NULL; 688 cgit_repolist.repos = NULL;
689 689
690 cgit_parse_args(argc, argv); 690 cgit_parse_args(argc, argv);
691 parse_configfile(ctx.env.cgit_config, config_cb); 691 parse_configfile(expand_macros(ctx.env.cgit_config), config_cb);
692 ctx.repo = NULL; 692 ctx.repo = NULL;
693 http_parse_querystring(ctx.qry.raw, querystring_cb); 693 http_parse_querystring(ctx.qry.raw, querystring_cb);
694 694
diff --git a/cgit.h b/cgit.h index cd4af72..568e0c0 100644 --- a/cgit.h +++ b/cgit.h
@@ -296,4 +296,6 @@ extern int cgit_close_filter(struct cgit_filter *filter);
296 296
297extern int readfile(const char *path, char **buf, size_t *size); 297extern int readfile(const char *path, char **buf, size_t *size);
298 298
299extern char *expand_macros(const char *txt);
300
299#endif /* CGIT_H */ 301#endif /* CGIT_H */
diff --git a/shared.c b/shared.c index 5f46793..76d26dd 100644 --- a/shared.c +++ b/shared.c
@@ -423,3 +423,74 @@ int readfile(const char *path, char **buf, size_t *size)
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
427int 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 */
434char *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 */
457char *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}