crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filter: allow returning exit code from filter

Browse Source 
Filters can now indicate a status back to cgit by means of the exit code
for exec, or the return value from close for Lua.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2014-01-14 18:07:23 +01:00
parent ce56d89a26
commit 6ca734da8f
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cgitrc.5.txt
View File

@ -590,7 +590,8 @@ specification with the relevant string; available values are:
This is called whenever cgit writes data to the webpage. This is called whenever cgit writes data to the webpage.
'filter_close()':: 'filter_close()'::
This is called when the current filtering operation is This is called when the current filtering operation is
completed. completed. It must return an integer value. Usually 0
indicates success.
Additionally, cgit exposes to the Lua the following built-in functions: Additionally, cgit exposes to the Lua the following built-in functions:

14
filter.c
View File

@ -106,7 +106,7 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
static int close_exec_filter(struct cgit_filter *base) static int close_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;
int i, exit_status; int i, exit_status = 0;
chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
"Unable to restore STDOUT"); "Unable to restore STDOUT");
@ -114,14 +114,14 @@ static int close_exec_filter(struct cgit_filter *base)
if (filter->pid < 0) if (filter->pid < 0)
goto done; goto done;
waitpid(filter->pid, &exit_status, 0); waitpid(filter->pid, &exit_status, 0);
if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status)) if (WIFEXITED(exit_status))
goto done; goto done;
die("Subprocess %s exited abnormally", filter->cmd); die("Subprocess %s exited abnormally", filter->cmd);
done: done:
for (i = 0; i < filter->base.argument_count; i++) for (i = 0; i < filter->base.argument_count; i++)
filter->argv[i + 1] = NULL; filter->argv[i + 1] = NULL;
return 0; return WEXITSTATUS(exit_status);
} }
@ -315,10 +315,14 @@ static int close_lua_filter(struct cgit_filter *base)
int ret = 0; int ret = 0;
lua_getglobal(filter->lua_state, "filter_close"); 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); error_lua_filter(filter);
ret = 1; ret = -1;
} else {
ret = lua_tonumber(filter->lua_state, -1);
lua_pop(filter->lua_state, 1);
} }
unhook_write(); unhook_write();
return ret; return ret;
} }

1
filters/email-gravatar.lua
View File

@ -16,6 +16,7 @@ end
function filter_close() function filter_close()
html("<img src='//www.gravatar.com/avatar/" .. md5 .. "?s=13&amp;d=retro' style='height:10pt;width:10pt' alt='Gravatar' /> " .. buffer) html("<img src='//www.gravatar.com/avatar/" .. md5 .. "?s=13&amp;d=retro' style='height:10pt;width:10pt' alt='Gravatar' /> " .. buffer)
return 0
end end
function filter_write(str) function filter_write(str)