/* cgit.c: cgi for the git scm
*
- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
item->util = xstrdup(value);
}
-static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
-{
- struct cgit_filter *f;
- int args_size = 0;
- int extra_args;
-
- if (!cmd || !cmd[0])
- return NULL;
-
- switch (filtertype) {
- case SOURCE:
- case ABOUT:
- extra_args = 1;
- break;
-
- case COMMIT:
- default:
- extra_args = 0;
- break;
- }
-
- f = xmalloc(sizeof(struct cgit_filter));
- f->cmd = xstrdup(cmd);
- args_size = (2 + extra_args) * sizeof(char *);
- f->argv = xmalloc(args_size);
- memset(f->argv, 0, args_size);
- f->argv[0] = f->cmd;
- return f;
-}
-
static void process_cached_repolist(const char *path);
static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
repo->logo_link = xstrdup(value);
else if (ctx.cfg.enable_filter_overrides) {
if (!strcmp(name, "about-filter"))
- repo->about_filter = new_filter(value, ABOUT);
+ repo->about_filter = cgit_new_filter(value, ABOUT);
else if (!strcmp(name, "commit-filter"))
- repo->commit_filter = new_filter(value, COMMIT);
+ repo->commit_filter = cgit_new_filter(value, COMMIT);
else if (!strcmp(name, "source-filter"))
- repo->source_filter = new_filter(value, SOURCE);
+ repo->source_filter = cgit_new_filter(value, SOURCE);
+ else if (!strcmp(name, "email-filter"))
+ repo->email_filter = cgit_new_filter(value, EMAIL);
}
}
else if (!strcmp(name, "case-sensitive-sort"))
ctx.cfg.case_sensitive_sort = atoi(value);
else if (!strcmp(name, "about-filter"))
- ctx.cfg.about_filter = new_filter(value, ABOUT);
+ ctx.cfg.about_filter = cgit_new_filter(value, ABOUT);
else if (!strcmp(name, "commit-filter"))
- ctx.cfg.commit_filter = new_filter(value, COMMIT);
+ ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
+ else if (!strcmp(name, "email-filter"))
+ ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);
else if (!strcmp(name, "embedded"))
ctx.cfg.embedded = atoi(value);
else if (!strcmp(name, "max-atom-items"))
else if (!strcmp(name, "section-sort"))
ctx.cfg.section_sort = atoi(value);
else if (!strcmp(name, "source-filter"))
- ctx.cfg.source_filter = new_filter(value, SOURCE);
+ ctx.cfg.source_filter = cgit_new_filter(value, SOURCE);
else if (!strcmp(name, "summary-log"))
ctx.cfg.summary_log = atoi(value);
else if (!strcmp(name, "summary-branches"))
fprintf(f, "repo.enable-log-linecount=%d\n",
repo->enable_log_linecount);
if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
- fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
+ cgit_fprintf_filter(repo->about_filter, f, "repo.about-filter=");
if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
- fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
+ cgit_fprintf_filter(repo->commit_filter, f, "repo.commit-filter=");
if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
- fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
+ cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
+ if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
+ cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");
if (repo->snapshots != ctx.cfg.snapshots) {
char *tmp = build_snapshot_setting(repo->snapshots);
fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");
int scan = 0;
for (i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "--cache=", 8)) {
+ if (!prefixcmp(argv[i], "--cache=")) {
ctx.cfg.cache_root = xstrdup(argv[i] + 8);
- }
- if (!strcmp(argv[i], "--nocache")) {
+ } else if (!strcmp(argv[i], "--nocache")) {
ctx.cfg.nocache = 1;
- }
- if (!strcmp(argv[i], "--nohttp")) {
+ } else if (!strcmp(argv[i], "--nohttp")) {
ctx.env.no_http = "1";
- }
- if (!strncmp(argv[i], "--query=", 8)) {
+ } else if (!prefixcmp(argv[i], "--query=")) {
ctx.qry.raw = xstrdup(argv[i] + 8);
- }
- if (!strncmp(argv[i], "--repo=", 7)) {
+ } else if (!prefixcmp(argv[i], "--repo=")) {
ctx.qry.repo = xstrdup(argv[i] + 7);
- }
- if (!strncmp(argv[i], "--page=", 7)) {
+ } else if (!prefixcmp(argv[i], "--page=")) {
ctx.qry.page = xstrdup(argv[i] + 7);
- }
- if (!strncmp(argv[i], "--head=", 7)) {
+ } else if (!prefixcmp(argv[i], "--head=")) {
ctx.qry.head = xstrdup(argv[i] + 7);
ctx.qry.has_symref = 1;
- }
- if (!strncmp(argv[i], "--sha1=", 7)) {
+ } else if (!prefixcmp(argv[i], "--sha1=")) {
ctx.qry.sha1 = xstrdup(argv[i] + 7);
ctx.qry.has_sha1 = 1;
- }
- if (!strncmp(argv[i], "--ofs=", 6)) {
+ } else if (!prefixcmp(argv[i], "--ofs=")) {
ctx.qry.ofs = atoi(argv[i] + 6);
- }
- if (!strncmp(argv[i], "--scan-tree=", 12) ||
- !strncmp(argv[i], "--scan-path=", 12)) {
- /* HACK: the global snapshot bitmask defines the
- * set of allowed snapshot formats, but the config
- * file hasn't been parsed yet so the mask is
- * currently 0. By setting all bits high before
- * scanning we make sure that any in-repo cgitrc
- * snapshot setting is respected by scan_tree().
- * BTW: we assume that there'll never be more than
- * 255 different snapshot formats supported by cgit...
+ } else if (!prefixcmp(argv[i], "--scan-tree=") ||
+ !prefixcmp(argv[i], "--scan-path=")) {
+ /*
+ * HACK: The global snapshot bit mask defines the set
+ * of allowed snapshot formats, but the config file
+ * hasn't been parsed yet so the mask is currently 0.
+ * By setting all bits high before scanning we make
+ * sure that any in-repo cgitrc snapshot setting is
+ * respected by scan_tree().
+ *
+ * NOTE: We assume that there aren't more than 8
+ * different snapshot formats supported by cgit...
*/
ctx.cfg.snapshots = 0xFF;
scan++;
const char *path;
int err, ttl;
+ cgit_init_filters();
+
prepare_context(&ctx);
cgit_repolist.length = 0;
cgit_repolist.count = 0;
ctx.cfg.cache_size = 0;
err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
ctx.qry.raw, ttl, process_request, &ctx);
+ cgit_cleanup_filters();
if (err)
cgit_print_error("Error processing page: %s (%d)",
strerror(err), err);
git.ckatri.com / cgit.git / blobdiff