projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make MAlias public. migrate $signature, so that I can test the new MCore.folder_hook...
[apps/madmutt.git]
/
lib-crypt
/
gnupgparse.c
diff --git
a/lib-crypt/gnupgparse.c
b/lib-crypt/gnupgparse.c
index
c0c944b
..
6be9f16
100644
(file)
--- a/
lib-crypt/gnupgparse.c
+++ b/
lib-crypt/gnupgparse.c
@@
-18,32
+18,15
@@
*
*/
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
+#include <lib-ui/curses.h>
-#include "mutt.h"
#include "pgp.h"
#include "charset.h"
#include "pgp.h"
#include "charset.h"
-
/****************
* Read the GNUPG keys. For now we read the complete keyring by
* calling gnupg in a special mode.
/****************
* Read the GNUPG keys. For now we read the complete keyring by
* calling gnupg in a special mode.
@@
-290,7
+273,7
@@
pgp_key_t pgp_get_candidates (pgp_ring_t keyring, string_list_t * hints)
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
- m_strreplace(&_chs,
C
harset);
+ m_strreplace(&_chs,
MCharset.c
harset);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);
@@
-327,7
+310,7
@@
pgp_key_t pgp_get_candidates (pgp_ring_t keyring, string_list_t * hints)
if (ferror (fp))
mutt_perror ("fgets");
if (ferror (fp))
mutt_perror ("fgets");
-
fclose (
fp);
+
m_fclose(&
fp);
mutt_wait_filter (thepid);
close (devnull);
mutt_wait_filter (thepid);
close (devnull);