| -rw-r--r-- | cgit.c | 50 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | shared.c | 3 |
3 files changed, 51 insertions, 3 deletions
@@ -87,24 +87,68 @@ static void cgit_print_cache(struct cacheitem *item) 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; } @@ -24,24 +24,25 @@ struct commitinfo { }; extern const char cgit_version[]; extern char *cgit_root; extern char *cgit_root_title; extern char *cgit_css; extern char *cgit_logo; extern char *cgit_logo_link; extern char *cgit_virtual_root; extern char *cgit_cache_root; +extern int cgit_nocache; extern int cgit_max_lock_attempts; extern int cgit_cache_root_ttl; extern int cgit_cache_repo_ttl; extern int cgit_cache_dynamic_ttl; extern int cgit_cache_static_ttl; extern int cgit_cache_max_create_time; extern char *cgit_repo_name; extern char *cgit_repo_desc; extern char *cgit_repo_owner; extern int cgit_query_has_symref; @@ -8,24 +8,25 @@ #include "cgit.h" char *cgit_root = "/usr/src/git"; char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; char *cgit_logo = "/git-logo.png"; char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; char *cgit_virtual_root = NULL; char *cgit_cache_root = "/var/cache/cgit"; +int cgit_nocache = 0; int cgit_max_lock_attempts = 5; int cgit_cache_root_ttl = 5; int cgit_cache_repo_ttl = 5; int cgit_cache_dynamic_ttl = 5; int cgit_cache_static_ttl = -1; int cgit_cache_max_create_time = 5; char *cgit_repo_name = NULL; char *cgit_repo_desc = NULL; char *cgit_repo_owner = NULL; int cgit_query_has_symref = 0; @@ -45,24 +46,26 @@ void cgit_global_config_cb(const char *name, const char *value) if (!strcmp(name, "root")) cgit_root = xstrdup(value); else if (!strcmp(name, "root-title")) cgit_root_title = xstrdup(value); else if (!strcmp(name, "css")) cgit_css = xstrdup(value); else if (!strcmp(name, "logo")) cgit_logo = xstrdup(value); else if (!strcmp(name, "logo-link")) cgit_logo_link = xstrdup(value); else if (!strcmp(name, "virtual-root")) cgit_virtual_root = xstrdup(value); + else if (!strcmp(name, "nocache")) + cgit_nocache = atoi(value); } void cgit_repo_config_cb(const char *name, const char *value) { if (!strcmp(name, "name")) cgit_repo_name = xstrdup(value); else if (!strcmp(name, "desc")) cgit_repo_desc = xstrdup(value); else if (!strcmp(name, "owner")) cgit_repo_owner = xstrdup(value); } |