filter: add interface layer

[cgit.git] / filter.c

diff --git a/filter.c b/filter.c
index f4ee9ac2167eee92c3dc0ba8719421d7d701c45c..0f3edb00e96eaca6464c3b212145f41825b05d02 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -13,8 +13,14 @@
 #include <string.h>
 #include <stdlib.h>
 
-int cgit_open_filter(struct cgit_filter *filter)
+static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       int i;
+
+       for (i = 0; i < filter->extra_args; i++)
+               filter->argv[i+1] = va_arg(ap, char *);
+
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
        chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
@@ -33,50 +39,96 @@ int cgit_open_filter(struct cgit_filter *filter)
        return 0;
 }
 
-
-int cgit_close_filter(struct cgit_filter *filter)
+static int close_exec_filter(struct cgit_filter *base)
 {
-       int exit_status;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       int i, exit_status;
 
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");
        close(filter->old_stdout);
        if (filter->pid < 0)
-               return 0;
+               goto done;
        waitpid(filter->pid, &exit_status, 0);
        if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status))
-               return 0;
+               goto done;
        die("Subprocess %s exited abnormally", filter->cmd);
+
+done:
+       for (i = 0; i < filter->extra_args; i++)
+               filter->argv[i+1] = NULL;
+       return 0;
+
 }
 
-struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
+static void fprintf_exec_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {
-       struct cgit_filter *f;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       fprintf(f, "%s%s\n", prefix, filter->cmd);
+}
+
+int cgit_open_filter(struct cgit_filter *filter, ...)
+{
+       int result;
+       va_list ap;
+       va_start(ap, filter);
+       result = filter->open(filter, ap);
+       va_end(ap);
+       return result;
+}
+
+int cgit_close_filter(struct cgit_filter *filter)
+{
+       return filter->close(filter);
+}
+
+void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix)
+{
+       filter->fprintf(filter, f, prefix);
+}
+
+void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv)
+{
+       memset(filter, 0, sizeof(*filter));
+       filter->base.open = open_exec_filter;
+       filter->base.close = close_exec_filter;
+       filter->base.fprintf = fprintf_exec_filter;
+       filter->cmd = cmd;
+       filter->argv = argv;
+}
+
+static struct cgit_filter *new_exec_filter(const char *cmd, filter_type filtertype)
+{
+       struct cgit_exec_filter *f;
        int args_size = 0;
-       int extra_args;
 
-       if (!cmd || !cmd[0])
-               return NULL;
+       f = xmalloc(sizeof(*f));
+       /* We leave argv for now and assign it below. */
+       cgit_exec_filter_init(f, xstrdup(cmd), NULL);
 
        switch (filtertype) {
                case SOURCE:
                case ABOUT:
-                       extra_args = 1;
+                       f->extra_args = 1;
                        break;
 
                case COMMIT:
                default:
-                       extra_args = 0;
+                       f->extra_args = 0;
                        break;
        }
-       
-       f = xmalloc(sizeof(struct cgit_filter));
-       memset(f, 0, sizeof(struct cgit_filter));
 
-       f->cmd = xstrdup(cmd);
-       args_size = (2 + extra_args) * sizeof(char *);
+       args_size = (2 + f->extra_args) * sizeof(char *);
        f->argv = xmalloc(args_size);
        memset(f->argv, 0, args_size);
        f->argv[0] = f->cmd;
-       return f;
+       return &f->base;
+}
+
+struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
+{
+       if (!cmd || !cmd[0])
+               return NULL;
+
+       return new_exec_filter(cmd, filtertype);
 }