author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 21:09:49 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 21:09:49 (UTC) |
commit | 9ecde6568a9e39c942f4c5585ffa494c5df870e4 (patch) (side-by-side diff) | |
tree | 52038a9c553102b13741cecd546435b03917374a /cgit.c | |
parent | 5b94c96a83f19a0175a8e1699d71080965793cc2 (diff) | |
download | cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.zip cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar.gz cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar.bz2 |
Let makefile override the configfile location
Pass CGIT_CONFIG from makefile during build, to enable stuff like
make CGIT_CONFIG=/var/cgit/cgit.conf
Noticed by Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -198,63 +198,63 @@ static void cgit_print_cache(struct cacheitem *item) close(fd); } static void cgit_parse_args(int argc, const char **argv) { int i; for (i = 1; i < argc; i++) { if (!strncmp(argv[i], "--cache=", 8)) { cgit_cache_root = xstrdup(argv[i]+8); } if (!strcmp(argv[i], "--nocache")) { cgit_nocache = 1; } if (!strncmp(argv[i], "--query=", 8)) { cgit_querystring = xstrdup(argv[i]+8); } if (!strncmp(argv[i], "--repo=", 7)) { cgit_query_repo = xstrdup(argv[i]+7); } if (!strncmp(argv[i], "--page=", 7)) { cgit_query_page = xstrdup(argv[i]+7); } if (!strncmp(argv[i], "--head=", 7)) { cgit_query_head = xstrdup(argv[i]+7); cgit_query_has_symref = 1; } if (!strncmp(argv[i], "--sha1=", 7)) { cgit_query_sha1 = xstrdup(argv[i]+7); cgit_query_has_sha1 = 1; } if (!strncmp(argv[i], "--ofs=", 6)) { cgit_query_ofs = atoi(argv[i]+6); } } } int main(int argc, const char **argv) { struct cacheitem item; htmlfd = STDOUT_FILENO; item.st.st_mtime = time(NULL); cgit_repolist.length = 0; cgit_repolist.count = 0; cgit_repolist.repos = NULL; - cgit_read_config("/etc/cgitrc", cgit_global_config_cb); + cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); if (getenv("QUERY_STRING")) cgit_querystring = xstrdup(getenv("QUERY_STRING")); cgit_parse_args(argc, argv); cgit_parse_query(cgit_querystring, cgit_querystring_cb); if (!cgit_prepare_cache(&item)) return 0; if (cgit_nocache) { cgit_fill_cache(&item, 0); } else { cgit_check_cache(&item); cgit_print_cache(&item); } return 0; } |