#endif
#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"
#include "mime.h"
#include "copy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <sys/wait.h>
void smime_void_passphrase (void)
{
- memset (SmimePass, 0, sizeof (SmimePass));
+ p_clear(SmimePass, sizeof(SmimePass));
SmimeExptime = 0;
}
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;
}
/* Read Entries */
cur = 0;
- Table = mem_calloc (cert_num, sizeof (smime_id));
+ Table = p_new(smime_id, cert_num);
while (!feof (index)) {
numFields =
fscanf (index, MUTT_FORMAT (STRING) " %x.%i " MUTT_FORMAT (STRING),
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;
if (!mailbox && !query)
return (NULL);
- addr_len = mailbox ? str_len (mailbox) : 0;
- query_len = query ? str_len (query) : 0;
+ addr_len = mailbox ? m_strlen(mailbox) : 0;
+ query_len = query ? m_strlen(query) : 0;
*key = '\0';
}
- /* Note: str_dup ("") returns NULL. */
- return str_dup (key);
+ /* Note: m_strdup("") returns NULL. */
+ return m_strdup(key);
}
if (k) {
/* the key used last time. */
if (*SmimeKeyToUse &&
- !str_casecmp (k, SmimeKeyToUse + str_len (SmimeKeys) + 1)) {
+ !str_casecmp (k, SmimeKeyToUse + m_strlen(SmimeKeys) + 1)) {
p_delete(&k);
return;
}
if (*SmimeKeyToUse) {
if (!str_casecmp (SmimeDefaultKey,
- SmimeKeyToUse + str_len (SmimeKeys) + 1))
+ SmimeKeyToUse + m_strlen(SmimeKeys) + 1))
return;
smime_void_passphrase ();
return NULL;
}
- keylist_size += str_len (keyID) + 2;
- mem_realloc (&keylist, keylist_size);
+ keylist_size += m_strlen(keyID) + 2;
+ p_realloc(&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
- keylist_used = str_len (keylist);
+ keylist_used = m_strlen(keylist);
rfc822_free_address (&addr);
while ((fgets (email, sizeof (email), fpout))) {
- *(email + str_len (email) - 1) = '\0';
- if (str_ncasecmp (email, mailbox, str_len (mailbox)) == 0)
+ *(email + m_strlen(email) - 1) = '\0';
+ if (str_ncasecmp (email, mailbox, m_strlen(mailbox)) == 0)
ret = 1;
ret = ret < 0 ? 0 : ret;
if (copy && buffer && num) {
(*num) = count;
- *buffer = mem_calloc (sizeof (char *), count);
+ *buffer = p_new(char *, count);
count = 0;
rewind (fpout);
while ((fgets (email, sizeof (email), fpout))) {
- *(email + str_len (email) - 1) = '\0';
- (*buffer)[count] = mem_calloc (1, str_len (email) + 1);
- strncpy ((*buffer)[count], email, str_len (email));
+ *(email + m_strlen(email) - 1) = '\0';
+ (*buffer)[count] = p_dupstr(email, m_strlen(email));
count++;
}
}
fclose (fpout);
fclose (fperr);
- return str_dup (certfile);
+ return m_strdup(certfile);
}
static char *smime_extract_signer_certificate (char *infile)
fclose (fpout);
fclose (fperr);
- return str_dup (certfile);
+ return m_strdup(certfile);
}
*certfile = '\0';
while (1) {
- int off = str_len (certfile);
+ int off = m_strlen(certfile);
while (*++cert_end && *cert_end != '\n');
if (!*cert_end)
t = mutt_new_body ();
t->type = TYPEAPPLICATION;
- t->subtype = str_dup ("x-pkcs7-mime");
+ t->subtype = m_strdup("x-pkcs7-mime");
mutt_set_parameter ("name", "smime.p7m", &t->parameter);
mutt_set_parameter ("smime-type", "enveloped-data", &t->parameter);
t->encoding = ENCBASE64; /* The output of OpenSSL SHOULD be binary */
t->use_disp = 1;
t->disposition = DISPATTACH;
- t->d_filename = str_dup ("smime.p7m");
- t->filename = str_dup (tempfile);
+ t->d_filename = m_strdup("smime.p7m");
+ t->filename = m_strdup(tempfile);
t->unlink = 1; /*delete after sending the message */
t->parts = 0;
t->next = 0;
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = str_dup ("signed");
+ t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t->parts->next = mutt_new_body ();
t = t->parts->next;
t->type = TYPEAPPLICATION;
- t->subtype = str_dup ("x-pkcs7-signature");
- t->filename = str_dup (signedfile);
- t->d_filename = str_dup ("smime.p7s");
+ t->subtype = m_strdup("x-pkcs7-signature");
+ t->filename = m_strdup(signedfile);
+ t->d_filename = m_strdup("smime.p7s");
t->use_disp = 1;
t->disposition = DISPATTACH;
t->encoding = ENCBASE64;
}
}
while (fgets (buf, sizeof (buf) - 1, smimeout) != NULL) {
- len = str_len (buf);
+ len = m_strlen(buf);
if (len > 1 && buf[len - 2] == '\r') {
buf[len - 2] = '\n';
buf[len - 1] = '\0';
if (b->parts)
return -1;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);