t0110: Chain together using &&

[cgit.git] / filter.c

diff --git a/filter.c b/filter.c
index aa36026a0434d500e5fe33f4e37671833b819e1b..ebf4937d24b9331703781b1d9fd01c6d512c767a 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -38,11 +38,14 @@ void cgit_cleanup_filters(void)
        reap_filter(ctx.cfg.commit_filter);
        reap_filter(ctx.cfg.source_filter);
        reap_filter(ctx.cfg.email_filter);
+       reap_filter(ctx.cfg.owner_filter);
+       reap_filter(ctx.cfg.auth_filter);
        for (i = 0; i < cgit_repolist.count; ++i) {
                reap_filter(cgit_repolist.repos[i].about_filter);
                reap_filter(cgit_repolist.repos[i].commit_filter);
                reap_filter(cgit_repolist.repos[i].source_filter);
                reap_filter(cgit_repolist.repos[i].email_filter);
+               reap_filter(cgit_repolist.repos[i].owner_filter);
        }
 }
 
@@ -69,7 +72,7 @@ static inline void hook_write(struct cgit_filter *filter, ssize_t (*new_write)(s
        filter_write = new_write;
 }
 
-static inline void unhook_write()
+static inline void unhook_write(void)
 {
        assert(filter_write != NULL);
        assert(current_write_filter != NULL);
@@ -79,11 +82,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 +108,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 +117,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 +191,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);
@@ -209,7 +212,7 @@ static inline int hook_lua_filter(lua_State *lua_state, void (*fn)(const char *t
        str = lua_tostring(lua_state, 1);
        if (!str)
                return 0;
-       
+
        save_filter_write = filter_write;
        save_filter = current_write_filter;
        unhook_write();
@@ -244,9 +247,14 @@ static int html_url_arg_lua_filter(lua_State *lua_state)
        return hook_lua_filter(lua_state, html_url_arg);
 }
 
+static int html_include_lua_filter(lua_State *lua_state)
+{
+       return hook_lua_filter(lua_state, (void (*)(const char *))html_include);
+}
+
 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;
@@ -279,6 +287,8 @@ static int init_lua_filter(struct lua_filter *filter)
        lua_setglobal(filter->lua_state, "html_url_path");
        lua_pushcfunction(filter->lua_state, html_url_arg_lua_filter);
        lua_setglobal(filter->lua_state, "html_url_arg");
+       lua_pushcfunction(filter->lua_state, html_include_lua_filter);
+       lua_setglobal(filter->lua_state, "html_include");
 
        if (luaL_dofile(filter->lua_state, filter->script_file)) {
                error_lua_filter(filter);
@@ -291,7 +301,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 +321,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);
 }
 
@@ -405,10 +419,18 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
                colon = NULL;
 
        switch (filtertype) {
+               case AUTH:
+                       argument_count = 12;
+                       break;
+
                case EMAIL:
                        argument_count = 2;
                        break;
 
+               case OWNER:
+                       argument_count = 0;
+                       break;
+
                case SOURCE:
                case ABOUT:
                        argument_count = 1;