author | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:33:32 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:38:45 (UTC) |
commit | 521dc7a4bf4af6115ffc3a94d447689bbaa22272 (patch) (side-by-side diff) | |
tree | cacb8ba6567e4f36a588d0e659318e0acbc7ea75 /cgit.c | |
parent | a1a79998f22fe8279be51fc1d31bfcf14031c109 (diff) | |
download | cgit-521dc7a4bf4af6115ffc3a94d447689bbaa22272.zip cgit-521dc7a4bf4af6115ffc3a94d447689bbaa22272.tar.gz cgit-521dc7a4bf4af6115ffc3a94d447689bbaa22272.tar.bz2 |
Add argument parsing + switch for uncached operation
This adds support for the following options to cgit:
--root=<path>
--cache=<path>
--nocache
--query=<querystring>
--repo=<reponame>
--page=<pagename>
--head=<branchname>
--sha1=<sha1>
--ofs=<number>
On startup, /etc/cgitrc is parsed, followed by argument parsing and
finally querystring parsing.
If --nocache is specified (or set in /etc/gitrc), caching is disabled and
cgit instead generates pages to stdout.
The combined effect of these two changes makes testing/debugging a lot
less painfull.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 50 |
1 files changed, 47 insertions, 3 deletions
@@ -51,60 +51,104 @@ static void cgit_fill_cache(struct cacheitem *item) } static void cgit_check_cache(struct cacheitem *item) { int i = 0; cache_prepare(item); top: if (++i > cgit_max_lock_attempts) { die("cgit_refresh_cache: unable to lock %s: %s", item->name, strerror(errno)); } if (!cache_exist(item)) { if (!cache_lock(item)) { sleep(1); goto top; } if (!cache_exist(item)) { cgit_fill_cache(item); cache_unlock(item); } else { cache_cancel_lock(item); } } else if (cache_expired(item) && cache_lock(item)) { if (cache_expired(item)) { cgit_fill_cache(item); cache_unlock(item); } else { cache_cancel_lock(item); } } } static void cgit_print_cache(struct cacheitem *item) { static char buf[4096]; ssize_t i; int fd = open(item->name, O_RDONLY); if (fd<0) die("Unable to open cached file %s", item->name); while((i=read(fd, buf, sizeof(buf))) > 0) write(STDOUT_FILENO, buf, i); close(fd); } +static void cgit_parse_args(int argc, const char **argv) +{ + int i; + + for (i = 1; i < argc; i++) { + if (!strncmp(argv[i], "--root=", 7)) { + cgit_root = xstrdup(argv[i]+7); + } + 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; cgit_read_config("/etc/cgitrc", cgit_global_config_cb); - cgit_querystring = xstrdup(getenv("QUERY_STRING")); + if (getenv("QUERY_STRING")) + cgit_querystring = xstrdup(getenv("QUERY_STRING")); + cgit_parse_args(argc, argv); cgit_parse_query(cgit_querystring, cgit_querystring_cb); - cgit_check_cache(&item); - cgit_print_cache(&item); + if (cgit_nocache) { + item.fd = STDOUT_FILENO; + cgit_fill_cache(&item); + } else { + cgit_check_cache(&item); + cgit_print_cache(&item); + } return 0; } |