author | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 08:17:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 08:17:23 (UTC) |
commit | cb92d05b6b729cd0e219b43d7a79aff832a9c1ac (patch) (unidiff) | |
tree | 3324266f779b12bcf9f80ad5ee2f18f535832549 /cgit.c | |
parent | 0730ee6ea4af45e29e7c74d4a32bde9d2d6c8104 (diff) | |
parent | 435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff) | |
download | cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.zip cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.gz cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -156,48 +156,51 @@ void config_cb(const char *name, const char *value) | |||
156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
162 | ctx.repo->module_link= xstrdup(value); | 162 | ctx.repo->module_link= xstrdup(value); |
163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | 163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
164 | ctx.repo->about_filter = new_filter(value, 0); | 164 | ctx.repo->about_filter = new_filter(value, 0); |
165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
166 | ctx.repo->commit_filter = new_filter(value, 0); | 166 | ctx.repo->commit_filter = new_filter(value, 0); |
167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
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 | ||
178 | static void querystring_cb(const char *name, const char *value) | 178 | static 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); |
192 | } else if (!strcmp(name, "h")) { | 195 | } else if (!strcmp(name, "h")) { |
193 | ctx.qry.head = xstrdup(value); | 196 | ctx.qry.head = xstrdup(value); |
194 | ctx.qry.has_symref = 1; | 197 | ctx.qry.has_symref = 1; |
195 | } else if (!strcmp(name, "id")) { | 198 | } else if (!strcmp(name, "id")) { |
196 | ctx.qry.sha1 = xstrdup(value); | 199 | ctx.qry.sha1 = xstrdup(value); |
197 | ctx.qry.has_sha1 = 1; | 200 | ctx.qry.has_sha1 = 1; |
198 | } else if (!strcmp(name, "id2")) { | 201 | } else if (!strcmp(name, "id2")) { |
199 | ctx.qry.sha2 = xstrdup(value); | 202 | ctx.qry.sha2 = xstrdup(value); |
200 | ctx.qry.has_sha1 = 1; | 203 | ctx.qry.has_sha1 = 1; |
201 | } else if (!strcmp(name, "ofs")) { | 204 | } else if (!strcmp(name, "ofs")) { |
202 | ctx.qry.ofs = atoi(value); | 205 | ctx.qry.ofs = atoi(value); |
203 | } else if (!strcmp(name, "path")) { | 206 | } else if (!strcmp(name, "path")) { |