projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the C gods blessed us with a preprocessor, use it.
[apps/madmutt.git]
/
headers.c
diff --git
a/headers.c
b/headers.c
index
6134788
..
a3476a8
100644
(file)
--- a/
headers.c
+++ b/
headers.c
@@
-11,11
+11,15
@@
# 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 "mutt.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
-#include "lib/
intl
.h"
+#include "lib/
debug
.h"
#include <sys/stat.h>
#include <string.h>
#include <sys/stat.h>
#include <string.h>
@@
-66,8
+70,7
@@
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) {
- dprint (1,
- (debugfile, "ci_edit_headers(): temp file was not modified.\n"));
+ debug_print (1, ("temp file was not modified.\n"));
/* the file has not changed! */
mutt_unlink (path);
return;
/* the file has not changed! */
mutt_unlink (path);
return;
@@
-126,10
+129,9
@@
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;
mutt_pretty_mailbox (fcc);
}
keep = 0;
@@
-139,18
+141,17
@@
void mutt_edit_headers (const char *editor,
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);
+ str_substrcpy
(path, p, q, sizeof
(path));
+
q = vskipspaces
(q);
}
else
}
else
-
strfcpy (path, p, sizeof (path)
);
+
m_strcpy(path, sizeof(path), p
);
mutt_expand_path (path, sizeof (path));
if ((body = mutt_make_file_attach (path))) {
mutt_expand_path (path, sizeof (path));
if ((body = mutt_make_file_attach (path))) {
- body->description =
safe_strdup
(q);
+ body->description =
m_strdup
(q);
for (parts = msg->content; parts->next; parts = parts->next);
parts->next = body;
}
for (parts = msg->content; parts->next; parts = parts->next);
parts->next = body;
}