}
if (optional)
- mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_smime_command,
+ m_strformat (dest, destlen, ifstring, _mutt_fmt_smime_command,
data, 0);
else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_smime_command,
+ m_strformat (dest, destlen, elsestring, _mutt_fmt_smime_command,
data, 0);
return (src);
struct smime_command_context *cctx,
const char *fmt)
{
- mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
+ m_strformat (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
(unsigned long) cctx, 0);
}
/* Make Helpstring */
helpstr[0] = 0;
mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_SMIME, OP_EXIT);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Select "), MENU_SMIME,
OP_GENERIC_SELECT_ENTRY);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Help"), MENU_SMIME, OP_HELP);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
/* Create the menu */
menu = mutt_new_menu ();
address_t *p, *q;
int i;
- const char *fqdn = mutt_fqdn (1);
-
for (i = 0; i < 3; i++) {
switch (i) {
case 0:
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
+ rfc822_qualify(tmp, mutt_fqdn(1));
address_list_uniq(tmp);
keylist_size += m_strlen(keyID) + 2;
p_realloc(&keylist, keylist_size);
- sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
+ sprintf (keylist + keylist_used, "%s\n", keyID);
keylist_used = m_strlen(keylist);
address_list_wipe(&addr);
fpout = m_tempfile (tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
if (!fpout) {
- mutt_perror (tempfname);
+ mutt_perror (_("Can't create temporary file"));
return 1;
}
fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (!fpout) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
return NULL;
}
tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (!tmpfp) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
return (-1);
}
*fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (!*fpout) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
rv = -1;
goto bail;
}
/* probably need a different passphrase */
crypt_smime_void_passphrase ();
}
-#if 0
- else
- msg->security &= ~SIGN;
-#endif
*redraw = REDRAW_FULL;
break;