css: use correct size in annotated decoration

[cgit.git] / filter.c

diff --git a/filter.c b/filter.c
index 270f0098612862e3980d8c89a2991200b2925329..70f5b749989c27e8bf1e87070066614805dbf5d6 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -8,23 +8,13 @@
 
 #include "cgit.h"
 #include "html.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <errno.h>
 #ifndef NO_LUA
+#include <dlfcn.h>
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #endif
 
-static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
-static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
-static struct cgit_filter *current_write_filter = NULL;
-
 static inline void reap_filter(struct cgit_filter *filter)
 {
        if (filter && filter->cleanup)
@@ -38,49 +28,21 @@ 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);
        }
 }
 
-void cgit_init_filters(void)
-{
-       libc_write = dlsym(RTLD_NEXT, "write");
-       if (!libc_write)
-               die("Could not locate libc's write function");
-}
-
-ssize_t write(int fd, const void *buf, size_t count)
-{
-       if (fd != STDOUT_FILENO || !filter_write)
-               return libc_write(fd, buf, count);
-       return filter_write(current_write_filter, buf, count);
-}
-
-static inline void hook_write(struct cgit_filter *filter, ssize_t (*new_write)(struct cgit_filter *base, const void *buf, size_t count))
-{
-       /* We want to avoid buggy nested patterns. */
-       assert(filter_write == NULL);
-       assert(current_write_filter == NULL);
-       current_write_filter = filter;
-       filter_write = new_write;
-}
-
-static inline void unhook_write()
-{
-       assert(filter_write != NULL);
-       assert(current_write_filter != NULL);
-       filter_write = NULL;
-       current_write_filter = NULL;
-}
-
 static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {
        struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
+       int pipe_fh[2];
        int i;
 
        for (i = 0; i < filter->base.argument_count; i++)
@@ -88,19 +50,19 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
+       chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess");
        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
        if (filter->pid == 0) {
-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
+               close(pipe_fh[1]);
+               chk_non_negative(dup2(pipe_fh[0], STDIN_FILENO),
                        "Unable to use pipe as STDIN");
                execvp(filter->cmd, filter->argv);
                die_errno("Unable to exec subprocess %s", filter->cmd);
        }
-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
+       close(pipe_fh[0]);
+       chk_non_negative(dup2(pipe_fh[1], STDOUT_FILENO),
                "Unable to use pipe as STDOUT");
-       close(filter->pipe_fh[1]);
+       close(pipe_fh[1]);
        return 0;
 }
 
@@ -174,7 +136,48 @@ void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **ar
        filter->base.argument_count = 0;
 }
 
+#ifdef NO_LUA
+void cgit_init_filters(void)
+{
+}
+#endif
+
 #ifndef NO_LUA
+static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
+static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
+static struct cgit_filter *current_write_filter = NULL;
+
+void cgit_init_filters(void)
+{
+       libc_write = dlsym(RTLD_NEXT, "write");
+       if (!libc_write)
+               die("Could not locate libc's write function");
+}
+
+ssize_t write(int fd, const void *buf, size_t count)
+{
+       if (fd != STDOUT_FILENO || !filter_write)
+               return libc_write(fd, buf, count);
+       return filter_write(current_write_filter, buf, count);
+}
+
+static inline void hook_write(struct cgit_filter *filter, ssize_t (*new_write)(struct cgit_filter *base, const void *buf, size_t count))
+{
+       /* We want to avoid buggy nested patterns. */
+       assert(filter_write == NULL);
+       assert(current_write_filter == NULL);
+       current_write_filter = filter;
+       filter_write = new_write;
+}
+
+static inline void unhook_write(void)
+{
+       assert(filter_write != NULL);
+       assert(current_write_filter != NULL);
+       filter_write = NULL;
+       current_write_filter = NULL;
+}
+
 struct lua_filter {
        struct cgit_filter base;
        char *script_file;
@@ -425,6 +428,10 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
                        argument_count = 2;
                        break;
 
+               case OWNER:
+                       argument_count = 0;
+                       break;
+
                case SOURCE:
                case ABOUT:
                        argument_count = 1;