if (k->kobj && k->kobj->subkeys) {
s = k->kobj->subkeys->keyid;
- if ((!option (OPTPGPLONGIDS)) && (mutt_strlen (s) == 16))
+ if ((!option (OPTPGPLONGIDS)) && (str_len (s) == 16))
/* Return only the short keyID. */
s += 8;
}
rv |= CRYPT_KV_STRONGID;
if (addr->mailbox && u_addr->mailbox
- && safe_strcasecmp (addr->mailbox, u_addr->mailbox) == 0)
+ && str_casecmp (addr->mailbox, u_addr->mailbox) == 0)
rv |= CRYPT_KV_ADDR;
if (addr->personal && u_addr->personal
- && safe_strcasecmp (addr->personal, u_addr->personal) == 0)
+ && str_casecmp (addr->personal, u_addr->personal) == 0)
rv |= CRYPT_KV_STRING;
return rv;
}
if (ret_fp)
*ret_fp = fp;
- return safe_strdup (tempfile);
+ return str_dup (tempfile);
}
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = safe_strdup ("signed");
+ t->subtype = str_dup ("signed");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t = t->parts->next;
t->type = TYPEAPPLICATION;
if (use_smime) {
- t->subtype = safe_strdup ("pkcs7-signature");
+ t->subtype = str_dup ("pkcs7-signature");
mutt_set_parameter ("name", "smime.p7s", &t->parameter);
t->encoding = ENCBASE64;
t->use_disp = 1;
t->disposition = DISPATTACH;
- t->d_filename = safe_strdup ("smime.p7s");
+ t->d_filename = str_dup ("smime.p7s");
}
else {
- t->subtype = safe_strdup ("pgp-signature");
+ t->subtype = str_dup ("pgp-signature");
t->use_disp = 0;
t->disposition = DISPINLINE;
t->encoding = ENC7BIT;
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = safe_strdup ("encrypted");
+ t->subtype = str_dup ("encrypted");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t->parts = mutt_new_body ();
t->parts->type = TYPEAPPLICATION;
- t->parts->subtype = safe_strdup ("pgp-encrypted");
+ t->parts->subtype = str_dup ("pgp-encrypted");
t->parts->encoding = ENC7BIT;
t->parts->next = mutt_new_body ();
t->parts->next->type = TYPEAPPLICATION;
- t->parts->next->subtype = safe_strdup ("octet-stream");
+ t->parts->next->subtype = str_dup ("octet-stream");
t->parts->next->encoding = ENC7BIT;
t->parts->next->filename = outfile;
t->parts->next->use_disp = 1;
t->parts->next->disposition = DISPINLINE;
t->parts->next->unlink = 1; /* delete after sending the message */
- t->parts->next->d_filename = safe_strdup ("msg.asc"); /* non pgp/mime
+ t->parts->next->d_filename = str_dup ("msg.asc"); /* non pgp/mime
can save */
return t;
t = mutt_new_body ();
t->type = TYPEAPPLICATION;
- t->subtype = safe_strdup ("pkcs7-mime");
+ t->subtype = str_dup ("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 = safe_strdup ("smime.p7m");
+ t->d_filename = str_dup ("smime.p7m");
t->filename = outfile;
t->unlink = 1; /*delete after sending the message */
t->parts = 0;
state_attach_puts (": ", s);
if (t0)
state_attach_puts (t0, s);
- if (t1 && !(t0 && !mutt_strcmp (t0, t1))) {
+ if (t1 && !(t0 && !str_cmp (t0, t1))) {
if (t0)
state_attach_puts (",", s);
state_attach_puts (t1, s);
return;
is_pgp = (key->protocol == GPGME_PROTOCOL_OpenPGP);
- buf = safe_malloc (mutt_strlen (prefix) + mutt_strlen (s) * 4 + 2);
+ buf = safe_malloc (str_len (prefix) + str_len (s) * 4 + 2);
strcpy (buf, prefix); /* __STRCPY_CHECKED__ */
- p = buf + mutt_strlen (buf);
- if (is_pgp && mutt_strlen (s) == 40) { /* PGP v4 style formatted. */
+ p = buf + str_len (buf);
+ if (is_pgp && str_len (s) == 40) { /* PGP v4 style formatted. */
for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
*p++ = s[0];
*p++ = s[1];
if (notation->value) {
state_attach_puts (notation->value, s);
if (!(*notation->value
- && (notation->value[mutt_strlen (notation->value) - 1] ==
+ && (notation->value[str_len (notation->value) - 1] ==
'\n')))
state_attach_puts ("\n", s);
}
}
while (fgets (buf, sizeof (buf), tfp)) {
- if (!safe_strncmp ("-----BEGIN PGP ", buf, 15)) {
- if (!mutt_strcmp ("MESSAGE-----\n", buf + 15))
+ if (!str_ncmp ("-----BEGIN PGP ", buf, 15)) {
+ if (!str_cmp ("MESSAGE-----\n", buf + 15))
enc = 1;
- else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15))
+ else if (!str_cmp ("SIGNED MESSAGE-----\n", buf + 15))
sgn = 1;
}
}
continue;
}
- if (!mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n"))
+ if (!str_cmp (buf, "-----BEGIN PGP SIGNATURE-----\n"))
break;
if (armor_header) {
break;
offset = ftell (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
+ bytes -= (offset - last_pos); /* don't rely on str_len(buf) */
last_pos = offset;
- if (!safe_strncmp ("-----BEGIN PGP ", buf, 15)) {
+ if (!str_ncmp ("-----BEGIN PGP ", buf, 15)) {
clearsign = 0;
start_pos = last_pos;
- if (!mutt_strcmp ("MESSAGE-----\n", buf + 15))
+ if (!str_cmp ("MESSAGE-----\n", buf + 15))
needpass = 1;
- else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15)) {
+ else if (!str_cmp ("SIGNED MESSAGE-----\n", buf + 15)) {
clearsign = 1;
needpass = 0;
}
else if (!option (OPTDONTHANDLEPGPKEYS) &&
- !mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) {
+ !str_cmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) {
needpass = 0;
pgp_keyblock = 1;
}
/* Copy PGP material to an data container */
armored_data = create_gpgme_data ();
- gpgme_data_write (armored_data, buf, mutt_strlen (buf));
+ gpgme_data_write (armored_data, buf, str_len (buf));
while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL) {
offset = ftell (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
+ bytes -= (offset - last_pos); /* don't rely on str_len(buf) */
last_pos = offset;
- gpgme_data_write (armored_data, buf, mutt_strlen (buf));
+ gpgme_data_write (armored_data, buf, str_len (buf));
- if ((needpass && !mutt_strcmp ("-----END PGP MESSAGE-----\n", buf))
+ if ((needpass && !str_cmp ("-----END PGP MESSAGE-----\n", buf))
|| (!needpass
- && (!mutt_strcmp ("-----END PGP SIGNATURE-----\n", buf)
- || !mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",
+ && (!str_cmp ("-----END PGP SIGNATURE-----\n", buf)
+ || !str_cmp ("-----END PGP PUBLIC KEY BLOCK-----\n",
buf))))
break;
}
crypt_key_t **t = (crypt_key_t **) b;
int r;
- if ((r = safe_strcasecmp ((*s)->uid, (*t)->uid)))
+ if ((r = str_casecmp ((*s)->uid, (*t)->uid)))
return r > 0;
else
- return safe_strcasecmp (crypt_keyid (*s), crypt_keyid (*t)) > 0;
+ return str_casecmp (crypt_keyid (*s), crypt_keyid (*t)) > 0;
}
static int crypt_compare_address (const void *a, const void *b)
crypt_key_t **t = (crypt_key_t **) b;
int r;
- if ((r = safe_strcasecmp (crypt_keyid (*s), crypt_keyid (*t))))
+ if ((r = str_casecmp (crypt_keyid (*s), crypt_keyid (*t))))
return r > 0;
else
- return safe_strcasecmp ((*s)->uid, (*t)->uid) > 0;
+ return str_casecmp ((*s)->uid, (*t)->uid) > 0;
}
static int crypt_compare_keyid (const void *a, const void *b)
if (ts < tt)
return 0;
- return safe_strcasecmp ((*s)->uid, (*t)->uid) > 0;
+ return str_casecmp ((*s)->uid, (*t)->uid) > 0;
}
static int crypt_compare_date (const void *a, const void *b)
if (ts < tt)
return 0;
- if ((r = safe_strcasecmp ((*s)->uid, (*t)->uid)))
+ if ((r = str_casecmp ((*s)->uid, (*t)->uid)))
return r > 0;
- return (safe_strcasecmp (crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0;
+ return (str_casecmp (crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0;
}
static int crypt_compare_trust (const void *a, const void *b)
int any = 0;
for (; dn->key; dn++) {
- if (!mutt_strcmp (dn->key, key)) {
+ if (!str_cmp (dn->key, key)) {
if (any)
fputs (" + ", fp);
- print_utf8 (fp, dn->value, mutt_strlen (dn->value));
+ print_utf8 (fp, dn->value, str_len (dn->value));
any = 1;
}
}
/* now print the rest without any specific ordering */
for (; dn->key; dn++) {
for (i = 0; stdpart[i]; i++) {
- if (!mutt_strcmp (dn->key, stdpart[i]))
+ if (!str_cmp (dn->key, stdpart[i]))
break;
}
if (!stdpart[i]) {
putc (' ', fp);
}
if (is_pgp)
- print_utf8 (fp, s, mutt_strlen (s));
+ print_utf8 (fp, s, str_len (s));
else
parse_and_print_user_id (fp, s);
putc ('\n', fp);
if (key->subkeys) {
s = key->subkeys->fpr;
fputs (_("Fingerprint: "), fp);
- if (is_pgp && mutt_strlen (s) == 40) {
+ if (is_pgp && str_len (s) == 40) {
for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
putc (*s, fp);
putc (s[1], fp);
s = subkey->keyid;
putc ('\n', fp);
- if (mutt_strlen (s) == 16)
+ if (str_len (s) == 16)
s += 8; /* display only the short keyID */
fprintf (fp, "Subkey ....: 0x%s", s);
if (subkey->revoked) {
k = key->kobj;
gpgme_key_ref (k);
- while ((s = k->chain_id) && k->subkeys && mutt_strcmp (s, k->subkeys->fpr)) {
+ while ((s = k->chain_id) && k->subkeys && str_cmp (s, k->subkeys->fpr)) {
putc ('\n', fp);
err = gpgme_op_keylist_start (listctx, s, 0);
gpgme_key_release (k);
patarr = safe_calloc (n + 1, sizeof *patarr);
for (l = hints, n = 0; l; l = l->next) {
if (l->data && *l->data)
- patarr[n++] = safe_strdup (l->data);
+ patarr[n++] = str_dup (l->data);
}
patarr[n] = NULL;
err = gpgme_op_keylist_ext_start (ctx, (const char **) patarr, secret, 0);
char *scratch;
char *t;
- if ((scratch = safe_strdup (str)) == NULL)
+ if ((scratch = str_dup (str)) == NULL)
return hints;
for (t = strtok (scratch, " ,.:\"()<>\n"); t;
t = strtok (NULL, " ,.:\"()<>\n")) {
- if (mutt_strlen (t) > 3)
+ if (str_len (t) > 3)
hints = mutt_add_list (hints, t);
}
match = 0;
debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid));
- if (!*p || !safe_strcasecmp (p, crypt_keyid (k))
- || (!safe_strncasecmp (p, "0x", 2)
- && !safe_strcasecmp (p + 2, crypt_keyid (k)))
+ if (!*p || !str_casecmp (p, crypt_keyid (k))
+ || (!str_ncasecmp (p, "0x", 2)
+ && !str_casecmp (p + 2, crypt_keyid (k)))
|| (option (OPTPGPLONGIDS)
- && !safe_strncasecmp (p, "0x", 2)
- && !safe_strcasecmp (p + 2, crypt_keyid (k) + 8))
+ && !str_ncasecmp (p, "0x", 2)
+ && !str_casecmp (p + 2, crypt_keyid (k) + 8))
|| str_isstr (k->uid, p)) {
crypt_key_t *tmp;
if (whatfor) {
for (l = id_defaults; l; l = l->next)
- if (!safe_strcasecmp (whatfor, l->what)) {
+ if (!str_casecmp (whatfor, l->what)) {
strfcpy (resp, NONULL (l->dflt), sizeof (resp));
break;
}
l = safe_malloc (sizeof (struct crypt_cache));
l->next = id_defaults;
id_defaults = l;
- l->what = safe_strdup (whatfor);
- l->dflt = safe_strdup (resp);
+ l->what = str_dup (whatfor);
+ l->dflt = str_dup (resp);
}
}
*r_application &= ~APPLICATION_SMIME;
#endif
- keylist_size += mutt_strlen (s) + 4 + 1;
+ keylist_size += str_len (s) + 4 + 1;
safe_realloc (&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s0x%s%s", /* __SPRINTF_CHECKED__ */
keylist_used ? " " : "", s, forced_valid ? "!" : "");
}
- keylist_used = mutt_strlen (keylist);
+ keylist_used = str_len (keylist);
crypt_free_key (&key);
rfc822_free_address (&addr);
int sender_length = 0;
int uid_length = 0;
- sender_length = mutt_strlen (sender->mailbox);
+ sender_length = str_len (sender->mailbox);
for (uid = key->uids; uid && ret; uid = uid->next) {
- uid_length = mutt_strlen (uid->email);
+ uid_length = str_len (uid->email);
if (1 && (uid->email[0] == '<')
&& (uid->email[uid_length - 1] == '>')
&& (uid_length == sender_length + 2)