projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
headers.c
diff --git
a/headers.c
b/headers.c
index
d1f2e35
..
058ec94
100644
(file)
--- a/
headers.c
+++ b/
headers.c
@@
-11,23
+11,21
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
-
-#include "mutt.h"
-#include "mutt_crypt.h"
-#include "mutt_idna.h"
-
-#include "lib/debug.h"
-
#include <sys/stat.h>
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
#include <string.h>
#include <ctype.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+
+#include "mutt.h"
+#include "alias.h"
+#include <lib-crypt/crypt.h>
+#include "mutt_idna.h"
+
void mutt_edit_headers (const char *editor,
const char *body,
void mutt_edit_headers (const char *editor,
const char *body,
- HEADER * msg, char *fcc, size_t fcclen)
+ HEADER * msg, char *fcc, s
s
ize_t fcclen)
{
char path[_POSIX_PATH_MAX]; /* tempfile used to edit headers + body */
char buffer[LONG_STRING];
{
char path[_POSIX_PATH_MAX]; /* tempfile used to edit headers + body */
char buffer[LONG_STRING];
@@
-37,7
+35,7
@@
void mutt_edit_headers (const char *editor,
ENVELOPE *n;
time_t mtime;
struct stat st;
ENVELOPE *n;
time_t mtime;
struct stat st;
-
LIST
*cur, **last = NULL, *tmp;
+
string_list_t
*cur, **last = NULL, *tmp;
mutt_mktemp (path);
if ((ofp = safe_fopen (path, "w")) == NULL) {
mutt_mktemp (path);
if ((ofp = safe_fopen (path, "w")) == NULL) {
@@
-70,14
+68,13
@@
void mutt_edit_headers (const char *editor,
mutt_edit_file (editor, path);
stat (path, &st);
if (mtime == st.st_mtime) {
mutt_edit_file (editor, path);
stat (path, &st);
if (mtime == st.st_mtime) {
- debug_print (1, ("temp file was not modified.\n"));
/* the file has not changed! */
mutt_unlink (path);
return;
}
mutt_unlink (body);
/* the file has not changed! */
mutt_unlink (path);
return;
}
mutt_unlink (body);
-
mutt_free_list
(&msg->env->userhdrs);
+
string_list_wipe
(&msg->env->userhdrs);
/* Read the temp file back in */
if ((ifp = fopen (path, "r")) == NULL) {
/* Read the temp file back in */
if ((ifp = fopen (path, "r")) == NULL) {
@@
-103,7
+100,7
@@
void mutt_edit_headers (const char *editor,
n->references = msg->env->references;
msg->env->references = NULL;
n->references = msg->env->references;
msg->env->references = NULL;
-
mutt_free_envelope
(&msg->env);
+
envelope_delete
(&msg->env);
msg->env = n;
n = NULL;
msg->env = n;
n = NULL;
@@
-111,7
+108,7
@@
void mutt_edit_headers (const char *editor,
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
-
mutt_free_list
(&msg->env->references);
+
string_list_wipe
(&msg->env->references);
mutt_expand_aliases_env (msg->env);
mutt_expand_aliases_env (msg->env);
@@
-164,8
+161,7
@@
void mutt_edit_headers (const char *editor,
}
}
- else if ((WithCrypto & APPLICATION_PGP)
- && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+ else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
if (msg->security)
msg->security |= APPLICATION_PGP;
msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
if (msg->security)
msg->security |= APPLICATION_PGP;
@@
-181,7
+177,7
@@
void mutt_edit_headers (const char *editor,
*last = cur->next;
cur = cur->next;
tmp->next = NULL;
*last = cur->next;
cur = cur->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
}
}
}
}
}
}