author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (unidiff) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /cgit.c | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2 |
Merge branch 'jh/ignorews'
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -231,64 +231,66 @@ static void querystring_cb(const char *name, const char *value) | |||
231 | ctx.qry.grep = xstrdup(value); | 231 | ctx.qry.grep = xstrdup(value); |
232 | } else if (!strcmp(name, "q")) { | 232 | } else if (!strcmp(name, "q")) { |
233 | ctx.qry.search = xstrdup(value); | 233 | ctx.qry.search = xstrdup(value); |
234 | } else if (!strcmp(name, "h")) { | 234 | } else if (!strcmp(name, "h")) { |
235 | ctx.qry.head = xstrdup(value); | 235 | ctx.qry.head = xstrdup(value); |
236 | ctx.qry.has_symref = 1; | 236 | ctx.qry.has_symref = 1; |
237 | } else if (!strcmp(name, "id")) { | 237 | } else if (!strcmp(name, "id")) { |
238 | ctx.qry.sha1 = xstrdup(value); | 238 | ctx.qry.sha1 = xstrdup(value); |
239 | ctx.qry.has_sha1 = 1; | 239 | ctx.qry.has_sha1 = 1; |
240 | } else if (!strcmp(name, "id2")) { | 240 | } else if (!strcmp(name, "id2")) { |
241 | ctx.qry.sha2 = xstrdup(value); | 241 | ctx.qry.sha2 = xstrdup(value); |
242 | ctx.qry.has_sha1 = 1; | 242 | ctx.qry.has_sha1 = 1; |
243 | } else if (!strcmp(name, "ofs")) { | 243 | } else if (!strcmp(name, "ofs")) { |
244 | ctx.qry.ofs = atoi(value); | 244 | ctx.qry.ofs = atoi(value); |
245 | } else if (!strcmp(name, "path")) { | 245 | } else if (!strcmp(name, "path")) { |
246 | ctx.qry.path = trim_end(value, '/'); | 246 | ctx.qry.path = trim_end(value, '/'); |
247 | } else if (!strcmp(name, "name")) { | 247 | } else if (!strcmp(name, "name")) { |
248 | ctx.qry.name = xstrdup(value); | 248 | ctx.qry.name = xstrdup(value); |
249 | } else if (!strcmp(name, "mimetype")) { | 249 | } else if (!strcmp(name, "mimetype")) { |
250 | ctx.qry.mimetype = xstrdup(value); | 250 | ctx.qry.mimetype = xstrdup(value); |
251 | } else if (!strcmp(name, "s")){ | 251 | } else if (!strcmp(name, "s")){ |
252 | ctx.qry.sort = xstrdup(value); | 252 | ctx.qry.sort = xstrdup(value); |
253 | } else if (!strcmp(name, "showmsg")) { | 253 | } else if (!strcmp(name, "showmsg")) { |
254 | ctx.qry.showmsg = atoi(value); | 254 | ctx.qry.showmsg = atoi(value); |
255 | } else if (!strcmp(name, "period")) { | 255 | } else if (!strcmp(name, "period")) { |
256 | ctx.qry.period = xstrdup(value); | 256 | ctx.qry.period = xstrdup(value); |
257 | } else if (!strcmp(name, "ss")) { | 257 | } else if (!strcmp(name, "ss")) { |
258 | ctx.qry.ssdiff = atoi(value); | 258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { | 259 | } else if (!strcmp(name, "all")) { |
260 | ctx.qry.show_all = atoi(value); | 260 | ctx.qry.show_all = atoi(value); |
261 | } else if (!strcmp(name, "context")) { | 261 | } else if (!strcmp(name, "context")) { |
262 | ctx.qry.context = atoi(value); | 262 | ctx.qry.context = atoi(value); |
263 | } else if (!strcmp(name, "ignorews")) { | ||
264 | ctx.qry.ignorews = atoi(value); | ||
263 | } | 265 | } |
264 | } | 266 | } |
265 | 267 | ||
266 | char *xstrdupn(const char *str) | 268 | char *xstrdupn(const char *str) |
267 | { | 269 | { |
268 | return (str ? xstrdup(str) : NULL); | 270 | return (str ? xstrdup(str) : NULL); |
269 | } | 271 | } |
270 | 272 | ||
271 | static void prepare_context(struct cgit_context *ctx) | 273 | static void prepare_context(struct cgit_context *ctx) |
272 | { | 274 | { |
273 | memset(ctx, 0, sizeof(*ctx)); | 275 | memset(ctx, 0, sizeof(*ctx)); |
274 | ctx->cfg.agefile = "info/web/last-modified"; | 276 | ctx->cfg.agefile = "info/web/last-modified"; |
275 | ctx->cfg.nocache = 0; | 277 | ctx->cfg.nocache = 0; |
276 | ctx->cfg.cache_size = 0; | 278 | ctx->cfg.cache_size = 0; |
277 | ctx->cfg.cache_dynamic_ttl = 5; | 279 | ctx->cfg.cache_dynamic_ttl = 5; |
278 | ctx->cfg.cache_max_create_time = 5; | 280 | ctx->cfg.cache_max_create_time = 5; |
279 | ctx->cfg.cache_repo_ttl = 5; | 281 | ctx->cfg.cache_repo_ttl = 5; |
280 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 282 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
281 | ctx->cfg.cache_root_ttl = 5; | 283 | ctx->cfg.cache_root_ttl = 5; |
282 | ctx->cfg.cache_scanrc_ttl = 15; | 284 | ctx->cfg.cache_scanrc_ttl = 15; |
283 | ctx->cfg.cache_static_ttl = -1; | 285 | ctx->cfg.cache_static_ttl = -1; |
284 | ctx->cfg.css = "/cgit.css"; | 286 | ctx->cfg.css = "/cgit.css"; |
285 | ctx->cfg.logo = "/cgit.png"; | 287 | ctx->cfg.logo = "/cgit.png"; |
286 | ctx->cfg.local_time = 0; | 288 | ctx->cfg.local_time = 0; |
287 | ctx->cfg.enable_tree_linenumbers = 1; | 289 | ctx->cfg.enable_tree_linenumbers = 1; |
288 | ctx->cfg.max_repo_count = 50; | 290 | ctx->cfg.max_repo_count = 50; |
289 | ctx->cfg.max_commit_count = 50; | 291 | ctx->cfg.max_commit_count = 50; |
290 | ctx->cfg.max_lock_attempts = 5; | 292 | ctx->cfg.max_lock_attempts = 5; |
291 | ctx->cfg.max_msg_len = 80; | 293 | ctx->cfg.max_msg_len = 80; |
292 | ctx->cfg.max_repodesc_len = 80; | 294 | ctx->cfg.max_repodesc_len = 80; |
293 | ctx->cfg.max_blob_size = 0; | 295 | ctx->cfg.max_blob_size = 0; |
294 | ctx->cfg.max_stats = 0; | 296 | ctx->cfg.max_stats = 0; |