static const char *
_mutt_fmt_pgp_command(char *dest, ssize_t destlen,
char op, const char *src, const char *prefix,
- const char *ifstring, const char *elsestring,
- unsigned long data, format_flag flags)
+ const char *ifstr, const char *elstr,
+ anytype data, format_flag flags)
{
char fmt[16];
- struct pgp_command_context *cctx = (struct pgp_command_context *) data;
+ struct pgp_command_context *cctx = data.ptr;
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
}
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_pgp_command, data,
- 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_pgp_command, data,
- 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ _mutt_fmt_pgp_command, data, 0);
- return (src);
+ return src;
}
static void
mutt_pgp_command(char *d, ssize_t dlen, struct pgp_command_context *cctx,
const char *fmt)
{
- mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
- (unsigned long) cctx, 0);
+ m_strformat(d, dlen, 0, fmt, _mutt_fmt_pgp_command, cctx, 0);
}
/*
void pgp_invoke_import (const char *fname)
{
- char _fname[_POSIX_PATH_MAX + SHORT_STRING];
+ char _fname[_POSIX_PATH_MAX + STRING];
char cmd[HUGE_STRING];
struct pgp_command_context cctx;
personal = addr->personal;
addr->personal = NULL;
- *tmp = '\0';
- mutt_addrlist_to_local (addr);
- rfc822_write_address_single (tmp, sizeof (tmp), addr, 0);
- mutt_quote_filename (buff, sizeof (buff), tmp);
+ mutt_addrlist_to_local(addr);
+ rfc822_addrcpy(tmp, sizeof(tmp), addr, 0);
+ mutt_quote_filename(buff, sizeof(buff), tmp);
addr->personal = personal;
for (; hints; hints = hints->next) {
mutt_quote_filename (quoted, sizeof (quoted), (char *) hints->data);
snprintf (tmpuids, sizeof (tmpuids), "%s %s", uids, quoted);
- strcpy (uids, tmpuids); /* __STRCPY_CHECKED__ */
+ m_strcpy(uids, sizeof(uids), tmpuids);
}
return pgp_invoke (pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd,