projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unused, drop
[apps/madmutt.git]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
9361204
..
da1e4cd
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-28,6
+28,7
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-hash/hash.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-44,8
+45,6
@@
extern int optind;
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
-#include "sha1.h"
-#include "md5.h"
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
#include "lib.h"
#include "pgplib.h"
#include "pgppacket.h"
@@
-126,10
+125,10
@@
int main (int argc, char *const argv[])
}
if (_kring)
}
if (_kring)
-
strfcpy (kring, _kring, sizeof (kring)
);
+
m_strcpy(kring, sizeof(kring), _kring
);
else {
if ((env_pgppath = getenv ("PGPPATH")))
else {
if ((env_pgppath = getenv ("PGPPATH")))
-
strfcpy (pgppath, env_pgppath, sizeof (pgppath)
);
+
m_strcpy(pgppath, sizeof(pgppath), env_pgppath
);
else if ((env_home = getenv ("HOME")))
snprintf (pgppath, sizeof (pgppath), "%s/.pgp", env_home);
else {
else if ((env_home = getenv ("HOME")))
snprintf (pgppath, sizeof (pgppath), "%s/.pgp", env_home);
else {