X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6ca734da8fb246ad2272826331e0d56428b96fa1..157f544ac2149a985b0f62e9381a759c0ae252ec:/filter.c

diff --git a/filter.c b/filter.c
index 0cce7bb..c7037a3 100644
--- a/filter.c
+++ b/filter.c
@@ -8,13 +8,7 @@
 
 #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 <lua.h>
 #include <lualib.h>
@@ -38,11 +32,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 +66,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);
@@ -209,7 +206,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,6 +241,11 @@ 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;
@@ -279,6 +281,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);
@@ -409,10 +413,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;