3 files changed, 51 insertions, 3 deletions

diff --git a/cgit.c b/cgit.c
index 37cdb83..9dbc608 100644
--- a/cgit.c
+++ b/cgit.c
@@ -75,36 +75,80 @@ static void cgit_check_cache(struct cacheitem *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;
 }
diff --git a/cgit.h b/cgit.h
index a54f2b5..b6b60c6 100644
--- a/cgit.h
+++ b/cgit.h
@@ -12,48 +12,49 @@ struct cacheitem {
         char *name;
         struct stat st;
         int ttl;
         int fd;
 };
 
 struct commitinfo {
         struct commit *commit;
         char *author;
         char *committer;
         char *subject;
         char *msg;
 };
 
 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;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 extern int   cgit_query_ofs;
 
 extern int htmlfd;
 
 extern void cgit_global_config_cb(const char *name, const char *value);
diff --git a/shared.c b/shared.c
index 5f2a5ce..7149597 100644
--- a/shared.c
+++ b/shared.c
@@ -1,80 +1,83 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #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;
 int cgit_query_has_sha1   = 0;
 
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_sha1   = NULL;
 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 
 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);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
 {
         if (!strcmp(name,"r")) {
                 cgit_query_repo = xstrdup(value);
         } else if (!strcmp(name, "p")) {
                 cgit_query_page = xstrdup(value);
         } else if (!strcmp(name, "h")) {
                 cgit_query_head = xstrdup(value);
                 cgit_query_has_symref = 1;
         } else if (!strcmp(name, "id")) {
                 cgit_query_sha1 = xstrdup(value);
                 cgit_query_has_sha1 = 1;