#include <ctype.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-/* for hexval */
-#include "mime.h"
-
-#include "lib/str.h"
#include "lib/debug.h"
/****************
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
- else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
+ else if (ob - buf == n && (buf[n] = 0, m_strlen(buf) < n))
memcpy (uid, buf, n);
}
p_delete(&buf);
{
debug_print (2, ("record type: %s\n", p));
- if (!str_cmp (p, "pub"));
- else if (!str_cmp (p, "sub"))
+ if (!m_strcmp(p, "pub"));
+ else if (!m_strcmp(p, "sub"))
*is_subkey = 1;
- else if (!str_cmp (p, "sec"));
- else if (!str_cmp (p, "ssb"))
+ else if (!m_strcmp(p, "sec"));
+ else if (!m_strcmp(p, "ssb"))
*is_subkey = 1;
- else if (!str_cmp (p, "uid"))
+ else if (!m_strcmp(p, "uid"))
is_uid = 1;
else
return NULL;
time.tm_sec = 0;
time.tm_min = 0;
time.tm_hour = 12;
- strncpy (tstr, p, 11);
+ m_strcpy(tstr, sizeof(tstr), p);
tstr[4] = '\0';
time.tm_year = atoi (tstr) - 1900;
tstr[7] = '\0';
uid = p_new(pgp_uid_t, 1);
fix_uid (p);
- uid->addr = str_dup (p);
+ uid->addr = m_strdup(p);
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;