summaryrefslogtreecommitdiffabout
authorFerry Huberts <ferry.huberts@pelagic.nl>2011-03-09 07:16:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-03-26 14:13:35 (UTC)
commit5db02854e64fa41aa459ea7d13fc827063deda41 (patch) (unidiff)
tree8db8d588e5d1f2bf3ede996e5907569389677eb8
parent3f1ebd3565afa33196dfc3e8584e04564987e33c (diff)
downloadcgit-5db02854e64fa41aa459ea7d13fc827063deda41.zip
cgit-5db02854e64fa41aa459ea7d13fc827063deda41.tar.gz
cgit-5db02854e64fa41aa459ea7d13fc827063deda41.tar.bz2
new_filter: correctly initialise all arguments for a new filter
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index f4dd6ef..e302a7c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -8,57 +8,59 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "cache.h" 11#include "cache.h"
12#include "cmd.h" 12#include "cmd.h"
13#include "configfile.h" 13#include "configfile.h"
14#include "html.h" 14#include "html.h"
15#include "ui-shared.h" 15#include "ui-shared.h"
16#include "ui-stats.h" 16#include "ui-stats.h"
17#include "scan-tree.h" 17#include "scan-tree.h"
18 18
19const char *cgit_version = CGIT_VERSION; 19const char *cgit_version = CGIT_VERSION;
20 20
21void add_mimetype(const char *name, const char *value) 21void add_mimetype(const char *name, const char *value)
22{ 22{
23 struct string_list_item *item; 23 struct string_list_item *item;
24 24
25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); 25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name));
26 item->util = xstrdup(value); 26 item->util = xstrdup(value);
27} 27}
28 28
29struct cgit_filter *new_filter(const char *cmd, int extra_args) 29struct cgit_filter *new_filter(const char *cmd, int extra_args)
30{ 30{
31 struct cgit_filter *f; 31 struct cgit_filter *f;
32 int args_size = 0;
32 33
33 if (!cmd || !cmd[0]) 34 if (!cmd || !cmd[0])
34 return NULL; 35 return NULL;
35 36
36 f = xmalloc(sizeof(struct cgit_filter)); 37 f = xmalloc(sizeof(struct cgit_filter));
37 f->cmd = xstrdup(cmd); 38 f->cmd = xstrdup(cmd);
38 f->argv = xmalloc((2 + extra_args) * sizeof(char *)); 39 args_size = (2 + extra_args) * sizeof(char *);
40 f->argv = xmalloc(args_size);
41 memset(f->argv, 0, args_size);
39 f->argv[0] = f->cmd; 42 f->argv[0] = f->cmd;
40 f->argv[1] = NULL;
41 return f; 43 return f;
42} 44}
43 45
44static void process_cached_repolist(const char *path); 46static void process_cached_repolist(const char *path);
45 47
46void repo_config(struct cgit_repo *repo, const char *name, const char *value) 48void repo_config(struct cgit_repo *repo, const char *name, const char *value)
47{ 49{
48 if (!strcmp(name, "name")) 50 if (!strcmp(name, "name"))
49 repo->name = xstrdup(value); 51 repo->name = xstrdup(value);
50 else if (!strcmp(name, "clone-url")) 52 else if (!strcmp(name, "clone-url"))
51 repo->clone_url = xstrdup(value); 53 repo->clone_url = xstrdup(value);
52 else if (!strcmp(name, "desc")) 54 else if (!strcmp(name, "desc"))
53 repo->desc = xstrdup(value); 55 repo->desc = xstrdup(value);
54 else if (!strcmp(name, "owner")) 56 else if (!strcmp(name, "owner"))
55 repo->owner = xstrdup(value); 57 repo->owner = xstrdup(value);
56 else if (!strcmp(name, "defbranch")) 58 else if (!strcmp(name, "defbranch"))
57 repo->defbranch = xstrdup(value); 59 repo->defbranch = xstrdup(value);
58 else if (!strcmp(name, "snapshots")) 60 else if (!strcmp(name, "snapshots"))
59 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); 61 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
60 else if (!strcmp(name, "enable-commit-graph")) 62 else if (!strcmp(name, "enable-commit-graph"))
61 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); 63 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
62 else if (!strcmp(name, "enable-log-filecount")) 64 else if (!strcmp(name, "enable-log-filecount"))
63 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 65 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
64 else if (!strcmp(name, "enable-log-linecount")) 66 else if (!strcmp(name, "enable-log-linecount"))