projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
gnupgparse.c
diff --git
a/gnupgparse.c
b/gnupgparse.c
index
30e73e2
..
c29ab84
100644
(file)
--- a/
gnupgparse.c
+++ b/
gnupgparse.c
@@
-88,7
+88,7
@@
static void fix_uid (char *uid)
char *ob;
size_t ibl, obl;
char *ob;
size_t ibl, obl;
- buf =
safe
_malloc (n + 1);
+ buf =
mem
_malloc (n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
iconv (cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
iconv (cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
@@
-96,10
+96,10
@@
static void fix_uid (char *uid)
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
- else if (ob - buf == n && (buf[n] = 0, s
afe_str
len (buf) < n))
+ else if (ob - buf == n && (buf[n] = 0, s
tr_
len (buf) < n))
memcpy (uid, buf, n);
}
memcpy (uid, buf, n);
}
-
FREE
(&buf);
+
mem_free
(&buf);
iconv_close (cd);
}
}
iconv_close (cd);
}
}
@@
-130,19
+130,19
@@
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 (!s
afe_str
cmp (p, "pub"));
- else if (!s
afe_str
cmp (p, "sub"))
+ if (!s
tr_
cmp (p, "pub"));
+ else if (!s
tr_
cmp (p, "sub"))
*is_subkey = 1;
*is_subkey = 1;
- else if (!s
afe_str
cmp (p, "sec"));
- else if (!s
afe_str
cmp (p, "ssb"))
+ else if (!s
tr_
cmp (p, "sec"));
+ else if (!s
tr_
cmp (p, "ssb"))
*is_subkey = 1;
*is_subkey = 1;
- else if (!s
afe_str
cmp (p, "uid"))
+ else if (!s
tr_
cmp (p, "uid"))
is_uid = 1;
else
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
is_uid = 1;
else
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k =
safe
_calloc (sizeof *k, 1);
+ k =
mem
_calloc (sizeof *k, 1);
break;
}
break;
}
@@
-246,9
+246,9
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
debug_print (2, ("user ID: %s\n", p));
debug_print (2, ("user ID: %s\n", p));
- uid =
safe
_calloc (sizeof (pgp_uid_t), 1);
+ uid =
mem
_calloc (sizeof (pgp_uid_t), 1);
fix_uid (p);
fix_uid (p);
- uid->addr = s
afe_str
dup (p);
+ uid->addr = s
tr_
dup (p);
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;