/* This is almost identical to ppgp's invoking interface. */
static const char *
-_mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
- const char *src, const char *prefix,
+_mutt_fmt_smime_command (char *dest, ssize_t destlen,
+ char op, const char *src, const char *prefix,
const char *ifstr, const char *elstr,
anytype data, format_flag flags)
{
break;
}
- if (optional)
- m_strformat(dest, destlen, ifstr, _mutt_fmt_smime_command, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, elstr, _mutt_fmt_smime_command, data, 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ _mutt_fmt_smime_command, data, 0);
- return (src);
+ return src;
}
struct smime_command_context *cctx,
const char *fmt)
{
- m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_smime_command, cctx, 0);
+ m_strformat(d, dlen, 0, fmt, _mutt_fmt_smime_command, cctx, 0);
}
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,