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]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
b1c59ff
..
e5f729e
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-26,6
+26,9
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include "lib/mem.h"
+#include "lib/str.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-707,7
+710,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 (
mutt_stri
str (s, hints[i]) != NULL)
+ if (
str_is
str (s, hints[i]) != NULL)
return 1;
}
return 1;
}
@@
-740,7
+743,7
@@
static void pgpring_find_candidates (char *ringfile, const char *hints[],
char *error_buf;
size_t error_buf_len;
char *error_buf;
size_t error_buf_len;
- error_buf_len = sizeof ("fopen: ") - 1 + strlen (ringfile) + 1;
+ error_buf_len = sizeof ("fopen: ") - 1 + s
afe_s
trlen (ringfile) + 1;
error_buf = safe_malloc (error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);
error_buf = safe_malloc (error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);