projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit strfcpy, only use m_strcpy.
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
b265b66
..
27cf073
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-11,8
+11,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
#include "mutt.h"
#include <lib-lib/ascii.h>
#include "mutt.h"
@@
-75,7
+77,7
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
/* Is it the begining of a header? */
if (nl && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
/* Is it the begining of a header? */
if (nl && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
- if (!from &&
str_ncmp
("From ", buf, 5) == 0) {
+ if (!from &&
m_strncmp
("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
from = 1;
if ((flags & CH_FROM) == 0)
continue;
from = 1;
@@
-165,7
+167,7
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
ignore = 1;
this_is_from = 0;
ignore = 1;
this_is_from = 0;
- if (!from &&
str_ncmp
("From ", buf, 5) == 0) {
+ if (!from &&
m_strncmp
("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
this_is_from = from = 1;
if ((flags & CH_FROM) == 0)
continue;
this_is_from = from = 1;
@@
-519,7
+521,7
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
-
strfcpy (prefix, ">", sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), ">"
);
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
hdr, 0);
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
hdr, 0);