#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "enter.h"
void smime_void_passphrase (void)
{
- memset (SmimePass, 0, sizeof (SmimePass));
+ p_clear(SmimePass, sizeof(SmimePass));
SmimeExptime = 0;
}
char buf1[LONG_STRING], buf2[LONG_STRING];
struct stat sb;
- strfcpy (path, NONULL (SmimeCALocation), sizeof (path));
+ m_strcpy(path, sizeof(path), NONULL(SmimeCALocation));
mutt_expand_path (path, sizeof (path));
mutt_quote_filename (buf1, sizeof (buf1), path);
struct smime_command_context cctx;
char cmd[HUGE_STRING];
- memset (&cctx, 0, sizeof (cctx));
+ p_clear(&cctx, 1);
if (!format || !*format)
return (pid_t) - 1;
}
fclose (index);
- FOREVER {
+ for (;;) {
*qry = 0;
if (mutt_get_field (prompt, qry, sizeof (qry), 0))
return NULL;
Table[cur].hash = hash;
Table[cur].suffix = hash_suffix;
- strncpy (Table[cur].email, fields[0], sizeof (Table[cur].email));
- strncpy (Table[cur].nick, fields[2], sizeof (Table[cur].nick));
+ m_strcpy(Table[cur].email, sizeof(Table[cur].email), fields[0]);
+ m_strcpy(Table[cur].nick, sizeof(Table[cur].nick), fields[2]);
Table[cur].trust = *fields[4];
Table[cur].public = public;
}
while (fgets (buf, sizeof (buf) - 1, fp) != NULL)
- if (mailbox && !(str_ncasecmp (mailbox, buf, addr_len))) {
+ if (mailbox && !(m_strncasecmp(mailbox, buf, addr_len))) {
numFields = sscanf (buf,
MUTT_FORMAT (STRING) " " MUTT_FORMAT (STRING) " "
MUTT_FORMAT (STRING) " " MUTT_FORMAT (STRING) " "
continue;
}
else if (choice == M_YES) {
- strfcpy (key, fields[1], sizeof (key));
+ m_strcpy(key, sizeof(key), fields[1]);
ask = 0;
break;
}
else {
if (public)
key_trust_level = *fields[4];
- strfcpy (key, fields[1], sizeof (key));
+ m_strcpy(key, sizeof(key), fields[1]);
}
found = 1;
}
/* query = label: return certificate. */
if (numFields >= 3 &&
- !(str_ncasecmp (query, fields[2], query_len))) {
+ !(m_strncasecmp(query, fields[2], query_len))) {
ask = 0;
- strfcpy (key, fields[1], sizeof (key));
+ m_strcpy(key, sizeof(key), fields[1]);
}
/* query = certificate: return intermediate certificate. */
else if (numFields >= 4 &&
- !(str_ncasecmp (query, fields[1], query_len))) {
+ !(m_strncasecmp(query, fields[1], query_len))) {
ask = 0;
- strfcpy (key, fields[3], sizeof (key));
+ m_strcpy(key, sizeof(key), fields[3]);
}
}
if (k) {
/* the key used last time. */
if (*SmimeKeyToUse &&
- !str_casecmp (k, SmimeKeyToUse + m_strlen(SmimeKeys) + 1)) {
+ !m_strcasecmp(k, SmimeKeyToUse + m_strlen(SmimeKeys) + 1)) {
p_delete(&k);
return;
}
snprintf (SmimeCertToUse, sizeof (SmimeCertToUse), "%s/%s",
NONULL (SmimeCertificates), k);
- if (str_casecmp (k, SmimeDefaultKey))
+ if (m_strcasecmp(k, SmimeDefaultKey))
smime_void_passphrase ();
p_delete(&k);
}
if (*SmimeKeyToUse) {
- if (!str_casecmp (SmimeDefaultKey,
+ if (!m_strcasecmp(SmimeDefaultKey,
SmimeKeyToUse + m_strlen(SmimeKeys) + 1))
return;
while ((fgets (email, sizeof (email), fpout))) {
*(email + m_strlen(email) - 1) = '\0';
- if (str_ncasecmp (email, mailbox, m_strlen(mailbox)) == 0)
+ if (m_strncasecmp(email, mailbox, m_strlen(mailbox)) == 0)
ret = 1;
ret = ret < 0 ? 0 : ret;
rewind (smimeerr);
line = mutt_read_line (line, &linelen, smimeerr, &lineno);
- if (linelen && !str_casecmp (line, "verification successful"))
+ if (linelen && !m_strcasecmp(line, "verification successful"))
badsig = 0;
p_delete(&line);
rewind (smimeerr);
line = mutt_read_line (line, &linelen, smimeerr, &lineno);
- if (linelen && !str_casecmp (line, "verification successful"))
+ if (linelen && !m_strcasecmp(line, "verification successful"))
m->goodsig = 1;
p_delete(&line);
}
if (b->parts)
return -1;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);