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) (unidiff) | |
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
@@ -222,39 +222,39 @@ static void cgit_parse_args(int argc, const char **argv) | |||
222 | if (!strncmp(argv[i], "--head=", 7)) { | 222 | if (!strncmp(argv[i], "--head=", 7)) { |
223 | cgit_query_head = xstrdup(argv[i]+7); | 223 | cgit_query_head = xstrdup(argv[i]+7); |
224 | cgit_query_has_symref = 1; | 224 | cgit_query_has_symref = 1; |
225 | } | 225 | } |
226 | if (!strncmp(argv[i], "--sha1=", 7)) { | 226 | if (!strncmp(argv[i], "--sha1=", 7)) { |
227 | cgit_query_sha1 = xstrdup(argv[i]+7); | 227 | cgit_query_sha1 = xstrdup(argv[i]+7); |
228 | cgit_query_has_sha1 = 1; | 228 | cgit_query_has_sha1 = 1; |
229 | } | 229 | } |
230 | if (!strncmp(argv[i], "--ofs=", 6)) { | 230 | if (!strncmp(argv[i], "--ofs=", 6)) { |
231 | cgit_query_ofs = atoi(argv[i]+6); | 231 | cgit_query_ofs = atoi(argv[i]+6); |
232 | } | 232 | } |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
236 | int main(int argc, const char **argv) | 236 | int main(int argc, const char **argv) |
237 | { | 237 | { |
238 | struct cacheitem item; | 238 | struct cacheitem item; |
239 | 239 | ||
240 | htmlfd = STDOUT_FILENO; | 240 | htmlfd = STDOUT_FILENO; |
241 | item.st.st_mtime = time(NULL); | 241 | item.st.st_mtime = time(NULL); |
242 | cgit_repolist.length = 0; | 242 | cgit_repolist.length = 0; |
243 | cgit_repolist.count = 0; | 243 | cgit_repolist.count = 0; |
244 | cgit_repolist.repos = NULL; | 244 | cgit_repolist.repos = NULL; |
245 | 245 | ||
246 | cgit_read_config("/etc/cgitrc", cgit_global_config_cb); | 246 | cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); |
247 | if (getenv("QUERY_STRING")) | 247 | if (getenv("QUERY_STRING")) |
248 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); | 248 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
249 | cgit_parse_args(argc, argv); | 249 | cgit_parse_args(argc, argv); |
250 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); | 250 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
251 | if (!cgit_prepare_cache(&item)) | 251 | if (!cgit_prepare_cache(&item)) |
252 | return 0; | 252 | return 0; |
253 | if (cgit_nocache) { | 253 | if (cgit_nocache) { |
254 | cgit_fill_cache(&item, 0); | 254 | cgit_fill_cache(&item, 0); |
255 | } else { | 255 | } else { |
256 | cgit_check_cache(&item); | 256 | cgit_check_cache(&item); |
257 | cgit_print_cache(&item); | 257 | cgit_print_cache(&item); |
258 | } | 258 | } |
259 | return 0; | 259 | return 0; |
260 | } | 260 | } |