#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
{
mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
(unsigned long) cctx, 0);
- dprint (2, (debugfile, "mutt_smime_command: %s\n", d));
+ debug_print (2, ("%s\n", d));
}
-
-
-
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
FILE ** smimeerr, int smimeinfd, int smimeoutfd,
int smimeerrfd, const char *fname,
if (!mailbox && !query)
return (NULL);
- addr_len = mailbox ? safe_strlen (mailbox) : 0;
- query_len = query ? safe_strlen (query) : 0;
+ addr_len = mailbox ? mutt_strlen (mailbox) : 0;
+ query_len = query ? mutt_strlen (query) : 0;
*key = '\0';
if (k) {
/* the key used last time. */
if (*SmimeKeyToUse &&
- !safe_strcasecmp (k, SmimeKeyToUse + safe_strlen (SmimeKeys) + 1)) {
+ !safe_strcasecmp (k, SmimeKeyToUse + mutt_strlen (SmimeKeys) + 1)) {
FREE (&k);
return;
}
if (*SmimeKeyToUse) {
if (!safe_strcasecmp (SmimeDefaultKey,
- SmimeKeyToUse + safe_strlen (SmimeKeys) + 1))
+ SmimeKeyToUse + mutt_strlen (SmimeKeys) + 1))
return;
smime_void_passphrase ();
return NULL;
}
- keylist_size += safe_strlen (keyID) + 2;
+ keylist_size += mutt_strlen (keyID) + 2;
safe_realloc (&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
- keylist_used = safe_strlen (keylist);
+ keylist_used = mutt_strlen (keylist);
rfc822_free_address (&addr);
while ((fgets (email, sizeof (email), fpout))) {
- *(email + safe_strlen (email) - 1) = '\0';
- if (safe_strncasecmp (email, mailbox, safe_strlen (mailbox)) == 0)
+ *(email + mutt_strlen (email) - 1) = '\0';
+ if (safe_strncasecmp (email, mailbox, mutt_strlen (mailbox)) == 0)
ret = 1;
ret = ret < 0 ? 0 : ret;
rewind (fpout);
while ((fgets (email, sizeof (email), fpout))) {
- *(email + safe_strlen (email) - 1) = '\0';
- (*buffer)[count] = safe_calloc (1, safe_strlen (email) + 1);
- strncpy ((*buffer)[count], email, safe_strlen (email));
+ *(email + mutt_strlen (email) - 1) = '\0';
+ (*buffer)[count] = safe_calloc (1, mutt_strlen (email) + 1);
+ strncpy ((*buffer)[count], email, mutt_strlen (email));
count++;
}
}
*certfile = '\0';
while (1) {
- int off = safe_strlen (certfile);
+ int off = mutt_strlen (certfile);
while (*++cert_end && *cert_end != '\n');
if (!*cert_end)
}
}
while (fgets (buf, sizeof (buf) - 1, smimeout) != NULL) {
- len = safe_strlen (buf);
+ len = mutt_strlen (buf);
if (len > 1 && buf[len - 2] == '\r') {
buf[len - 2] = '\n';
buf[len - 1] = '\0';
case 4: /* sign (a)s */
if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) {
- p[safe_strlen (p) - 1] = '\0';
+ p[mutt_strlen (p) - 1] = '\0';
str_replace (&SmimeDefaultKey, p);
msg->security |= SIGN;