summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2009-08-17 08:17:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-17 08:17:23 (UTC)
commitcb92d05b6b729cd0e219b43d7a79aff832a9c1ac (patch) (unidiff)
tree3324266f779b12bcf9f80ad5ee2f18f535832549 /cgit.c
parent0730ee6ea4af45e29e7c74d4a32bde9d2d6c8104 (diff)
parent435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
downloadcgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.zip
cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.gz
cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.bz2
Merge branch 'stable'
Diffstat (limited to 'cgit.c') (more/less context) (show whitespace changes)
-rw-r--r--cgit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 66dd140..5816f3d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -168,24 +168,27 @@ void config_cb(const char *name, const char *value)
168 ctx.repo->source_filter = new_filter(value, 1); 168 ctx.repo->source_filter = new_filter(value, 1);
169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
170 if (*value == '/') 170 if (*value == '/')
171 ctx.repo->readme = xstrdup(value); 171 ctx.repo->readme = xstrdup(value);
172 else 172 else
173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
174 } else if (!strcmp(name, "include")) 174 } else if (!strcmp(name, "include"))
175 parse_configfile(value, config_cb); 175 parse_configfile(value, config_cb);
176} 176}
177 177
178static void querystring_cb(const char *name, const char *value) 178static void querystring_cb(const char *name, const char *value)
179{ 179{
180 if (!value)
181 value = "";
182
180 if (!strcmp(name,"r")) { 183 if (!strcmp(name,"r")) {
181 ctx.qry.repo = xstrdup(value); 184 ctx.qry.repo = xstrdup(value);
182 ctx.repo = cgit_get_repoinfo(value); 185 ctx.repo = cgit_get_repoinfo(value);
183 } else if (!strcmp(name, "p")) { 186 } else if (!strcmp(name, "p")) {
184 ctx.qry.page = xstrdup(value); 187 ctx.qry.page = xstrdup(value);
185 } else if (!strcmp(name, "url")) { 188 } else if (!strcmp(name, "url")) {
186 ctx.qry.url = xstrdup(value); 189 ctx.qry.url = xstrdup(value);
187 cgit_parse_url(value); 190 cgit_parse_url(value);
188 } else if (!strcmp(name, "qt")) { 191 } else if (!strcmp(name, "qt")) {
189 ctx.qry.grep = xstrdup(value); 192 ctx.qry.grep = xstrdup(value);
190 } else if (!strcmp(name, "q")) { 193 } else if (!strcmp(name, "q")) {
191 ctx.qry.search = xstrdup(value); 194 ctx.qry.search = xstrdup(value);