projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use good m_ functions, because it smell like a flower, version 2.
[apps/madmutt.git]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
da1e4cd
..
d7e5612
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-22,32
+22,22
@@
*
*/
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
#include <lib-hash/hash.h>
#include <lib-hash/hash.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#else
extern char *optarg;
extern int optind;
#endif
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#else
extern char *optarg;
extern int optind;
#endif
-#include <errno.h>
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
@@
-706,7
+696,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;
}
@@
-783,9
+773,7
@@
static void pgpring_find_candidates (char *ringfile, const char *hints[],
FGETPOS (rfp, pos);
}
FGETPOS (rfp, pos);
}
-
- fclose (rfp);
-
+ m_fclose(&rfp);
}
static void print_userid (const char *id)
}
static void print_userid (const char *id)
@@
-908,13
+896,3
@@
static void pgpring_dump_keyblock (pgp_key_t p)
}
}
}
}
}
}
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
- return (char *) message;
-}