aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2006-12-16 21:33:32 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2006-12-16 21:38:45 (JST)
commit521dc7a4bf4af6115ffc3a94d447689bbaa22272 (patch)
treecacb8ba6567e4f36a588d0e659318e0acbc7ea75
parenta1a79998f22fe8279be51fc1d31bfcf14031c109 (diff)
downloadcgit-521dc7a4bf4af6115ffc3a94d447689bbaa22272.zip
cgit-521dc7a4bf4af6115ffc3a94d447689bbaa22272.tar.gz
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.c50
-rw-r--r--cgit.h1
-rw-r--r--shared.c3
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
@@ -96,15 +96,59 @@ static void cgit_print_cache(struct cacheitem *item)
96 close(fd); 96 close(fd);
97} 97}
98 98
99static void cgit_parse_args(int argc, const char **argv)
100{
101 int i;
102
103 for (i = 1; i < argc; i++) {
104 if (!strncmp(argv[i], "--root=", 7)) {
105 cgit_root = xstrdup(argv[i]+7);
106 }
107 if (!strncmp(argv[i], "--cache=", 8)) {
108 cgit_cache_root = xstrdup(argv[i]+8);
109 }
110 if (!strcmp(argv[i], "--nocache")) {
111 cgit_nocache = 1;
112 }
113 if (!strncmp(argv[i], "--query=", 8)) {
114 cgit_querystring = xstrdup(argv[i]+8);
115 }
116 if (!strncmp(argv[i], "--repo=", 7)) {
117 cgit_query_repo = xstrdup(argv[i]+7);
118 }
119 if (!strncmp(argv[i], "--page=", 7)) {
120 cgit_query_page = xstrdup(argv[i]+7);
121 }
122 if (!strncmp(argv[i], "--head=", 7)) {
123 cgit_query_head = xstrdup(argv[i]+7);
124 cgit_query_has_symref = 1;
125 }
126 if (!strncmp(argv[i], "--sha1=", 7)) {
127 cgit_query_sha1 = xstrdup(argv[i]+7);
128 cgit_query_has_sha1 = 1;
129 }
130 if (!strncmp(argv[i], "--ofs=", 6)) {
131 cgit_query_ofs = atoi(argv[i]+6);
132 }
133 }
134}
135
99int main(int argc, const char **argv) 136int main(int argc, const char **argv)
100{ 137{
101 struct cacheitem item; 138 struct cacheitem item;
102 139
103 cgit_read_config("/etc/cgitrc", cgit_global_config_cb); 140 cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
104 cgit_querystring = xstrdup(getenv("QUERY_STRING")); 141 if (getenv("QUERY_STRING"))
142 cgit_querystring = xstrdup(getenv("QUERY_STRING"));
143 cgit_parse_args(argc, argv);
105 cgit_parse_query(cgit_querystring, cgit_querystring_cb); 144 cgit_parse_query(cgit_querystring, cgit_querystring_cb);
106 145
107 cgit_check_cache(&item); 146 if (cgit_nocache) {
108 cgit_print_cache(&item); 147 item.fd = STDOUT_FILENO;
148 cgit_fill_cache(&item);
149 } else {
150 cgit_check_cache(&item);
151 cgit_print_cache(&item);
152 }
109 return 0; 153 return 0;
110} 154}
diff --git a/cgit.h b/cgit.h
index a54f2b5..b6b60c6 100644
--- a/cgit.h
+++ b/cgit.h
@@ -33,6 +33,7 @@ extern char *cgit_logo_link;
33extern char *cgit_virtual_root; 33extern char *cgit_virtual_root;
34extern char *cgit_cache_root; 34extern char *cgit_cache_root;
35 35
36extern int cgit_nocache;
36extern int cgit_max_lock_attempts; 37extern int cgit_max_lock_attempts;
37extern int cgit_cache_root_ttl; 38extern int cgit_cache_root_ttl;
38extern int cgit_cache_repo_ttl; 39extern int cgit_cache_repo_ttl;
diff --git a/shared.c b/shared.c
index 5f2a5ce..7149597 100644
--- a/shared.c
+++ b/shared.c
@@ -17,6 +17,7 @@ char *cgit_virtual_root = NULL;
17 17
18char *cgit_cache_root = "/var/cache/cgit"; 18char *cgit_cache_root = "/var/cache/cgit";
19 19
20int cgit_nocache = 0;
20int cgit_max_lock_attempts = 5; 21int cgit_max_lock_attempts = 5;
21int cgit_cache_root_ttl = 5; 22int cgit_cache_root_ttl = 5;
22int cgit_cache_repo_ttl = 5; 23int cgit_cache_repo_ttl = 5;
@@ -54,6 +55,8 @@ void cgit_global_config_cb(const char *name, const char *value)
54 cgit_logo_link = xstrdup(value); 55 cgit_logo_link = xstrdup(value);
55 else if (!strcmp(name, "virtual-root")) 56 else if (!strcmp(name, "virtual-root"))
56 cgit_virtual_root = xstrdup(value); 57 cgit_virtual_root = xstrdup(value);
58 else if (!strcmp(name, "nocache"))
59 cgit_nocache = atoi(value);
57} 60}
58 61
59void cgit_repo_config_cb(const char *name, const char *value) 62void cgit_repo_config_cb(const char *name, const char *value)