diff options
| author | Erich Eckner <git@eckner.net> | 2024-05-17 21:03:29 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2024-05-17 21:06:43 +0200 |
| commit | e57c7d523224962ce2f55370b06fee94750db31c (patch) | |
| tree | 92c7abaaf656efccd2fd98348ebc6966d8cf635f | |
| parent | 007f24aafcef892459aefd5a3f2676142260df20 (diff) | |
| download | alpine-e57c7d523224962ce2f55370b06fee94750db31c.tar.xz | |
split gf_io_t into gf_i_t and gf_o_trules
| -rw-r--r-- | alpine/dispfilt.c | 5 | ||||
| -rw-r--r-- | alpine/dispfilt.h | 2 | ||||
| -rw-r--r-- | pith/rules.c | 3 | ||||
| -rw-r--r-- | pith/state.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/alpine/dispfilt.c b/alpine/dispfilt.c index 25cae59f..4c415759 100644 --- a/alpine/dispfilt.c +++ b/alpine/dispfilt.c @@ -460,7 +460,7 @@ df_valid_test(struct mail_bodystruct *body, char *test) } char * -exec_function_rule(char *rawcmd, gf_io_t input_gc, gf_io_t output_pc) +exec_function_rule(char *rawcmd, gf_i_t input_gc, gf_o_t output_pc) { char *status = NULL, *cmd, *tmpfile = NULL; @@ -470,7 +470,8 @@ exec_function_rule(char *rawcmd, gf_io_t input_gc, gf_io_t output_pc) if(tmpfile){ PIPE_S *filter_pipe; FILE *fp; - gf_io_t gc, pc; + gf_i_t gc; + gf_o_t pc; STORE_S *tmpf_so; /* write the tmp file */ diff --git a/alpine/dispfilt.h b/alpine/dispfilt.h index e0e04d97..465b8e90 100644 --- a/alpine/dispfilt.h +++ b/alpine/dispfilt.h @@ -25,7 +25,7 @@ char *dfilter_trigger(BODY *, char *, size_t); char *expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *); char *filter_session_key(void); char *filter_data_file(int); -char *exec_function_rule(char *, gf_io_t, gf_io_t); +char *exec_function_rule(char *, gf_i_t, gf_o_t); #endif /* PINE_DISPFILT_INCLUDED */ diff --git a/pith/rules.c b/pith/rules.c index 3ab373e2..9792ed8f 100644 --- a/pith/rules.c +++ b/pith/rules.c @@ -1365,7 +1365,8 @@ char * exec_fcn (RULEACTION_S *action, int ctxt, ENVELOPE *env) { STORE_S *output_so; - gf_io_t gc, pc; + gf_i_t gc; + gf_o_t pc; char *status, *rv, *cmd, *test; if(!(action->context & ctxt)) diff --git a/pith/state.h b/pith/state.h index 40e6dfd0..188f3922 100644 --- a/pith/state.h +++ b/pith/state.h @@ -367,7 +367,7 @@ struct pine { struct { char *(*display_filter)(char *, STORE_S *, gf_o_t, FILTLIST_S *); char *(*display_filter_trigger)(BODY *, char *, size_t); - char *(*exec_rule)(char *, gf_io_t, gf_io_t); + char *(*exec_rule)(char *, gf_i_t, gf_o_t); } tools; KEYWORD_S *keywords; |