aboutsummaryrefslogtreecommitdiff
path: root/filter.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'filter.c')
-rw-r--r--filter.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/filter.c b/filter.c
index 70f5b74..c778d05 100644
--- a/filter.c
+++ b/filter.c
@@ -114,7 +114,7 @@ static struct cgit_filter *new_exec_filter(const char *cmd, int argument_count)
f = xmalloc(sizeof(*f));
/* We leave argv for now and assign it below. */
- cgit_exec_filter_init(f, xstrdup(cmd), NULL);
+ cgit_exec_filter_init(f, strdup_first_line(cmd), NULL);
f->base.argument_count = argument_count;
args_size = (2 + argument_count) * sizeof(char *);
f->argv = xmalloc(args_size);
@@ -128,7 +128,7 @@ void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **ar
memset(filter, 0, sizeof(*filter));
filter->base.open = open_exec_filter;
filter->base.close = close_exec_filter;
- filter->base.fprintf = fprintf_exec_filter;
+ filter->base.fprintfp = fprintf_exec_filter;
filter->base.cleanup = cleanup_exec_filter;
filter->cmd = cmd;
filter->argv = argv;
@@ -353,10 +353,10 @@ static struct cgit_filter *new_lua_filter(const char *cmd, int argument_count)
memset(filter, 0, sizeof(*filter));
filter->base.open = open_lua_filter;
filter->base.close = close_lua_filter;
- filter->base.fprintf = fprintf_lua_filter;
+ filter->base.fprintfp = fprintf_lua_filter;
filter->base.cleanup = cleanup_lua_filter;
filter->base.argument_count = argument_count;
- filter->script_file = xstrdup(cmd);
+ filter->script_file = strdup_first_line(cmd);
return &filter->base;
}
@@ -385,7 +385,7 @@ int cgit_close_filter(struct cgit_filter *filter)
void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix)
{
- filter->fprintf(filter, f, prefix);
+ filter->fprintfp(filter, f, prefix);
}
@@ -402,7 +402,7 @@ static const struct {
struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
{
- char *colon;
+ const char *colon;
int i;
size_t len;
int argument_count;