projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move all the parameter related functions into the lib-mime.
[apps/madmutt.git]
/
headers.c
diff --git
a/headers.c
b/headers.c
index
031e2a9
..
d94019d
100644
(file)
--- a/
headers.c
+++ b/
headers.c
@@
-11,22
+11,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <sys/stat.h>
+#include <string.h>
+#include <ctype.h>
+
#include <lib-lib/macros.h>
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt.h"
-#include "a
scii
.h"
-#include
"mutt_crypt.h"
+#include "a
lias
.h"
+#include
<lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "mutt_idna.h"
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.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];
@@
-36,7
+36,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) {
@@
-69,14
+69,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) {
@@
-102,7
+101,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;
@@
-110,7
+109,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);
@@
-128,33
+127,31
@@
void mutt_edit_headers (const char *editor,
* message based upon this one.
*/
if (fcc && ascii_strncasecmp ("fcc:", cur->data, 4) == 0) {
* message based upon this one.
*/
if (fcc && ascii_strncasecmp ("fcc:", cur->data, 4) == 0) {
- p = cur->data + 4;
- SKIPWS (p);
+ p = vskipspaces(cur->data + 4);
if (*p) {
if (*p) {
-
strfcpy (fcc, p, fcclen
);
+
m_strcpy(fcc, fcclen, p
);
mutt_pretty_mailbox (fcc);
}
keep = 0;
}
else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
mutt_pretty_mailbox (fcc);
}
keep = 0;
}
else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
- BODY *body;
+ BODY *b
b
ody;
BODY *parts;
char *q;
BODY *parts;
char *q;
- p = cur->data + 7;
- SKIPWS (p);
+ p = vskipspaces(cur->data + 7);
if (*p) {
if ((q = strpbrk (p, " \t"))) {
if (*p) {
if ((q = strpbrk (p, " \t"))) {
-
str_substrcpy (path, p, q, sizeof (path)
);
-
SKIPWS
(q);
+
m_strncpy(path, sizeof(path), p, q - p
);
+
q = vskipspaces
(q);
}
else
}
else
-
strfcpy (path, p, sizeof (path)
);
+
m_strcpy(path, sizeof(path), p
);
mutt_expand_path (path, sizeof (path));
mutt_expand_path (path, sizeof (path));
- if ((body = mutt_make_file_attach (path))) {
- body->description = m_strdup(q);
+ if ((b
b
ody = mutt_make_file_attach (path))) {
+ b
b
ody->description = m_strdup(q);
for (parts = msg->content; parts->next; parts = parts->next);
for (parts = msg->content; parts->next; parts = parts->next);
- parts->next = body;
+ parts->next = b
b
ody;
}
else {
mutt_pretty_mailbox (path);
}
else {
mutt_pretty_mailbox (path);
@@
-165,8
+162,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;
@@
-182,7
+178,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);
}
}
}
}
}
}