filter: allow returning exit code from filter

[ps-cgit] / filter.c

diff --git a/filter.c b/filter.c
index 08ce7a5a021a598bc304f42d3760ac9eda0bfefa..0cce7bb6a4d6e42ec018c009df1abfc55e652a31 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -79,11 +79,11 @@ static inline void unhook_write()
 
 static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {
-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
        int i;
 
        for (i = 0; i < filter->base.argument_count; i++)
-               filter->argv[i+1] = va_arg(ap, char *);
+               filter->argv[i + 1] = va_arg(ap, char *);
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
@@ -105,8 +105,8 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
 
 static int close_exec_filter(struct cgit_filter *base)
 {
-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
-       int i, exit_status;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
+       int i, exit_status = 0;
 
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");
@@ -114,26 +114,26 @@ static int close_exec_filter(struct cgit_filter *base)
        if (filter->pid < 0)
                goto done;
        waitpid(filter->pid, &exit_status, 0);
-       if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status))
+       if (WIFEXITED(exit_status))
                goto done;
        die("Subprocess %s exited abnormally", filter->cmd);
 
 done:
        for (i = 0; i < filter->base.argument_count; i++)
-               filter->argv[i+1] = NULL;
-       return 0;
+               filter->argv[i + 1] = NULL;
+       return WEXITSTATUS(exit_status);
 
 }
 
 static void fprintf_exec_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {
-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
        fprintf(f, "%sexec:%s\n", prefix, filter->cmd);
 }
 
 static void cleanup_exec_filter(struct cgit_filter *base)
 {
-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
        if (filter->argv) {
                free(filter->argv);
                filter->argv = NULL;
@@ -188,7 +188,7 @@ static void error_lua_filter(struct lua_filter *filter)
 
 static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_t count)
 {
-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;
 
        lua_getglobal(filter->lua_state, "filter_write");
        lua_pushlstring(filter->lua_state, buf, count);
@@ -246,7 +246,7 @@ static int html_url_arg_lua_filter(lua_State *lua_state)
 
 static void cleanup_lua_filter(struct cgit_filter *base)
 {
-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;
 
        if (!filter->lua_state)
                return;
@@ -291,7 +291,7 @@ static int init_lua_filter(struct lua_filter *filter)
 
 static int open_lua_filter(struct cgit_filter *base, va_list ap)
 {
-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;
        int i;
 
        if (init_lua_filter(filter))
@@ -311,21 +311,25 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
 
 static int close_lua_filter(struct cgit_filter *base)
 {
-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;
        int ret = 0;
 
        lua_getglobal(filter->lua_state, "filter_close");
-       if (lua_pcall(filter->lua_state, 0, 0, 0)) {
+       if (lua_pcall(filter->lua_state, 0, 1, 0)) {
                error_lua_filter(filter);
-               ret = 1;
+               ret = -1;
+       } else {
+               ret = lua_tonumber(filter->lua_state, -1);
+               lua_pop(filter->lua_state, 1);
        }
+
        unhook_write();
        return ret;
 }
 
 static void fprintf_lua_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {
-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;
        fprintf(f, "%slua:%s\n", prefix, filter->script_file);
 }
 
@@ -406,6 +410,9 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
 
        switch (filtertype) {
                case EMAIL:
+                       argument_count = 2;
+                       break;
+
                case SOURCE:
                case ABOUT:
                        argument_count = 1;