projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove a whole lot of #include mutt.h
[apps/madmutt.git]
/
lib-crypt
/
smime.c
diff --git
a/lib-crypt/smime.c
b/lib-crypt/smime.c
index
f96b31d
..
479fd8c
100644
(file)
--- a/
lib-crypt/smime.c
+++ b/
lib-crypt/smime.c
@@
-9,45
+9,26
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
-#include "mutt.h"
#include "alias.h"
#include "handler.h"
#include "copy.h"
#include "alias.h"
#include "alias.h"
#include "handler.h"
#include "copy.h"
#include "alias.h"
+
#include "crypt.h"
#include "crypt.h"
+#include "smime.h"
struct smime_command_context {
const char *key; /* %k */
struct smime_command_context {
const char *key; /* %k */
@@
-628,15
+609,11
@@
char *smime_get_field_from_db (char *mailbox, char *query, short public,
return m_strdup(key);
}
return m_strdup(key);
}
-
-
-
/*
This sets the '*ToUse' variables for an upcoming decryption, where
the reuquired key is different from SmimeDefaultKey.
*/
/*
This sets the '*ToUse' variables for an upcoming decryption, where
the reuquired key is different from SmimeDefaultKey.
*/
-
-void _smime_getkeys (char *mailbox)
+static void _smime_getkeys (char *mailbox)
{
char *k = NULL;
char buf[STRING];
{
char *k = NULL;
char buf[STRING];
@@
-756,7
+733,7
@@
char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
if (fqdn)
rfc822_qualify (tmp, fqdn);
if (fqdn)
rfc822_qualify (tmp, fqdn);
-
tmp = mutt_remove_duplicates
(tmp);
+
address_list_uniq
(tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];