#include <string.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_ssl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#if OPENSSL_VERSION_NUMBER >= 0x00904000L
static char ret[SHORT_STRING];
char *c, *c2;
- strfcpy (ret, _("Unknown"), sizeof (ret));
+ m_strcpy(ret, sizeof(ret), _("Unknown"));
c = strstr (line, ndx);
if (c) {
- c += str_len (ndx);
+ c += m_strlen(ndx);
c2 = strchr (c, '/');
if (c2)
*c2 = '\0';
- strfcpy (ret, c, sizeof (ret));
+ m_strcpy(ret, sizeof(ret), c);
if (c2)
*c2 = '/';
}
int j;
if (!X509_digest (cert, EVP_md5 (), md, &n)) {
- snprintf (s, l, "%s", _("[unable to calculate]"));
+ m_strcpy(s, l, _("[unable to calculate]"));
}
else {
for (j = 0; j < (int) n; j++) {
char ch[8];
- snprintf (ch, 8, "%02X%s", md[j], (j % 2 ? " " : ""));
- str_cat (s, l, ch);
+ snprintf(ch, 8, "%02X%s", md[j], (j % 2 ? " " : ""));
+ m_strcat(s, l, ch);
}
}
}
static char buf[64];
BIO *bio;
- strfcpy (buf, _("[invalid date]"), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), _("[invalid date]"));
bio = BIO_new (BIO_s_mem ());
if (bio) {
menu->dialog[i] = p_new(char, SHORT_STRING);
row = 0;
- strfcpy (menu->dialog[row], _("This certificate belongs to:"),
- SHORT_STRING);
+ m_strcpy(menu->dialog[row], SHORT_STRING,
+ _("This certificate belongs to:"));
row++;
name = X509_NAME_oneline (X509_get_subject_name (data->cert),
buf, sizeof (buf));
}
row++;
- strfcpy (menu->dialog[row], _("This certificate was issued by:"),
- SHORT_STRING);
+ m_strcpy(menu->dialog[row], SHORT_STRING,
+ _("This certificate was issued by:"));
row++;
name = X509_NAME_oneline (X509_get_issuer_name (data->cert),
buf, sizeof (buf));
helpstr[0] = '\0';
mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_GENERIC, OP_EXIT);
- str_cat (helpstr, sizeof (helpstr), buf);
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Help"), MENU_GENERIC, OP_HELP);
- str_cat (helpstr, sizeof (helpstr), buf);
+ m_strcat(helpstr, sizeof(helpstr), buf);
menu->help = helpstr;
done = 0;