rv = 0;
}
- if (strncmp (line, "[GNUPG:] ", 9) == 0)
+ if (m_strncmp (line, "[GNUPG:] ", 9) == 0)
continue;
fputs (line, fpout);
fputc ('\n', fpout);
tempfp = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
if (tempfp == NULL) {
- mutt_perror (tempfname);
+ mutt_perror (_("Can't create temporary file"));
return;
}
while (fgets (buf, sizeof (buf) - 1, pgpout) != NULL) {
len = m_strlen(buf);
if (len > 1 && buf[len - 2] == '\r')
- strcpy (buf + len - 2, "\n"); /* __STRCPY_CHECKED__ */
+ m_strcpy(buf + len - 2, len - 2, "\n");
fputs (buf, fpout);
}
s.fpin = fpin;
*fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (*fpout == NULL) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
return (-1);
}
unlink (tempfile);
static short is_numerical_keyid (const char *s)
{
/* or should we require the "0x"? */
- if (strncmp (s, "0x", 2) == 0)
+ if (m_strncmp (s, "0x", 2) == 0)
s += 2;
if (m_strlen(s) % 8)
return 0;
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
+ rfc822_qualify (tmp, fqdn);
address_list_uniq(tmp);
p->mailbox);
if ((r = mutt_yesorno (buf, M_YES)) == M_YES) {
if (is_numerical_keyid (keyID)) {
- if (strncmp (keyID, "0x", 2) == 0)
+ if (m_strncmp (keyID, "0x", 2) == 0)
keyID += 2;
goto bypass_selection; /* you don't see this. */
}
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
- if (fqdn)
- rfc822_qualify (addr, fqdn);
+ rfc822_qualify (addr, fqdn);
q = addr;
}
else
bypass_selection:
keylist_size += m_strlen(keyID) + 4;
p_realloc(&keylist, keylist_size);
- sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
+ sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "",
keyID);
keylist_used = m_strlen(keylist);
fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (fpout == NULL) {
- mutt_perror (tempfile);
+ mutt_perror (_("Can't create temporary file"));
return (NULL);
}
int pgp_send_menu (HEADER * msg, int *redraw)
{
pgp_key_t p;
- char input_signas[SHORT_STRING];
+ char input_signas[STRING];
char prompt[LONG_STRING];
crypt_pgp_void_passphrase (); /* probably need a different passphrase */
}
-#if 0
- else {
- msg->security &= ~SIGN;
- }
-#endif
*redraw = REDRAW_FULL;
break;