diff options
Diffstat (limited to 'pith/detoken.c')
| -rw-r--r-- | pith/detoken.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/pith/detoken.c b/pith/detoken.c index 0546cf04..6f0584ab 100644 --- a/pith/detoken.c +++ b/pith/detoken.c @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: detoken.c 769 2007-10-24 00:15:40Z hubert@u.washingt #include "../pith/reply.h" #include "../pith/mailindx.h" #include "../pith/options.h" -#include "../pith/rules.h" + /* * Hook to read signature from local file @@ -90,8 +90,6 @@ detoken(ACTION_S *role, ENVELOPE *env, int prenewlines, int postnewlines, if(is_sig){ /* - * First we check if there is a rule about signatures, if there is - * use it, otherwise keep going and do the following: * If role->litsig is set, we use it; * Else, if VAR_LITERAL_SIG is set, we use that; * Else, if role->sig is set, we use that; @@ -105,25 +103,14 @@ detoken(ACTION_S *role, ENVELOPE *env, int prenewlines, int postnewlines, * there is no reason to mix them, so we don't provide support to * do so. */ - { RULE_RESULT *rule; - rule = get_result_rule(V_COMPOSE_RULES, FOR_COMPOSE, env); - if (rule){ - sigfile = cpystr(rule->result); - if (rule->result) - fs_give((void **)&rule->result); - fs_give((void **)&rule); - } - } - if (!sigfile){ - if(role && role->litsig) - literal_sig = role->litsig; - else if(ps_global->VAR_LITERAL_SIG) - literal_sig = ps_global->VAR_LITERAL_SIG; - else if(role && role->sig) - sigfile = role->sig; - else - sigfile = ps_global->VAR_SIGNATURE_FILE; - } + if(role && role->litsig) + literal_sig = role->litsig; + else if(ps_global->VAR_LITERAL_SIG) + literal_sig = ps_global->VAR_LITERAL_SIG; + else if(role && role->sig) + sigfile = role->sig; + else + sigfile = ps_global->VAR_SIGNATURE_FILE; } else if(role && role->template) sigfile = role->template; @@ -314,7 +301,7 @@ top: } } } - else if(pt->what_for & (FOR_REPLY_INTRO | FOR_RULE)) + else if(pt->what_for & FOR_REPLY_INTRO) repl = get_reply_data(env, role, pt->ctype, subbuf, sizeof(subbuf)-1); |