projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify the configure.ac using PKG_CONFIG to detect qdbm correctly.
[apps/madmutt.git]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
6d3fc5c
..
7b297ed
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-46,8
+46,8
@@
extern int optind;
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
#include "lib.h"
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
#include "lib.h"
-#include
"pgplib.h"
-#include
"pgppacket.h"
+#include
<lib-crypt/pgplib.h>
+#include
<lib-crypt/pgppacket.h>
#define MD5_DIGEST_LENGTH 16
#define MD5_DIGEST_LENGTH 16
@@
-125,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 {
@@
-706,7
+706,7
@@
static int pgpring_string_matches_hint (const char *s, const char *hints[],
return 1;
for (i = 0; i < nhints; i++) {
return 1;
for (i = 0; i < nhints; i++) {
- if (
str_isstr
(s, hints[i]) != NULL)
+ if (
m_stristr
(s, hints[i]) != NULL)
return 1;
}
return 1;
}