projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always use compressed mode.
[apps/madmutt.git]
/
gnupgparse.c
diff --git
a/gnupgparse.c
b/gnupgparse.c
index
4d2d72d
..
03bab1a
100644
(file)
--- a/
gnupgparse.c
+++ b/
gnupgparse.c
@@
-36,13
+36,12
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.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"
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-/* for hexval */
-#include "mime.h"
-
#include "lib/debug.h"
/****************
#include "lib/debug.h"
/****************
@@
-87,7
+86,7
@@
static void fix_uid (char *uid)
char *buf;
const char *ib;
char *ob;
char *buf;
const char *ib;
char *ob;
- size_t ibl, obl;
+ s
s
ize_t ibl, obl;
buf = p_new(char, n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
buf = p_new(char, n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
@@
-131,13
+130,13
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
{
debug_print (2, ("record type: %s\n", p));
{
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;
*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;
*is_subkey = 1;
- else if (!
str_cmp
(p, "uid"))
+ else if (!
m_strcmp
(p, "uid"))
is_uid = 1;
else
return NULL;
is_uid = 1;
else
return NULL;
@@
-205,29
+204,29
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
debug_print (2, ("key id: %s\n", p));
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
debug_print (2, ("key id: %s\n", p));
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
-
str_replace
(&k->keyid, p);
+
m_strreplace
(&k->keyid, p);
break;
}
case 6: /* timestamp (1998-02-28) */
{
char tstr[11];
break;
}
case 6: /* timestamp (1998-02-28) */
{
char tstr[11];
- struct tm time;
+ struct tm
st_
time;
debug_print (2, ("time stamp: %s\n", p));
if (!p)
break;
debug_print (2, ("time stamp: %s\n", p));
if (!p)
break;
- time.tm_sec = 0;
- time.tm_min = 0;
- time.tm_hour = 12;
-
strncpy (tstr, p, 11
);
+
st_
time.tm_sec = 0;
+
st_
time.tm_min = 0;
+
st_
time.tm_hour = 12;
+
m_strcpy(tstr, sizeof(tstr), p
);
tstr[4] = '\0';
tstr[4] = '\0';
- time.tm_year = atoi (tstr) - 1900;
+
st_
time.tm_year = atoi (tstr) - 1900;
tstr[7] = '\0';
tstr[7] = '\0';
- time.tm_mon = (atoi (tstr + 5)) - 1;
- time.tm_mday = atoi (tstr + 8);
- k->gen_time = mutt_mktime (&time, 0);
+
st_
time.tm_mon = (atoi (tstr + 5)) - 1;
+
st_
time.tm_mday = atoi (tstr + 8);
+ k->gen_time = mutt_mktime (&
st_
time, 0);
break;
}
case 7: /* valid for n days */
break;
}
case 7: /* valid for n days */
@@
-311,7
+310,7
@@
pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
-
str_replace
(&_chs, Charset);
+
m_strreplace
(&_chs, Charset);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);