projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify rfc822 parsing *A LOT*
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
2d205de
..
66d30b8
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-11,16
+11,19
@@
# 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 <lib-mime/mime.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
-#include "mime.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
@@
-75,7
+78,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
+168,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
+522,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);
@@
-603,7
+606,7
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
if (flags & M_CM_DECODE) {
/* now make a text/plain version of the message */
if (flags & M_CM_DECODE) {
/* now make a text/plain version of the message */
-
memset (&s, 0, sizeof (STATE)
);
+
p_clear(&s, 1
);
s.fpin = fpin;
s.fpout = fpout;
if (flags & M_CM_PREFIX)
s.fpin = fpin;
s.fpout = fpout;
if (flags & M_CM_PREFIX)
@@
-810,7
+813,7
@@
static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
* XXX - fix that.
*/
* XXX - fix that.
*/
-static void format_address_header (char **h,
ADDRESS
* a)
+static void format_address_header (char **h,
address_t
* a)
{
char buf[HUGE_STRING];
char cbuf[STRING];
{
char buf[HUGE_STRING];
char cbuf[STRING];
@@
-824,7
+827,7
@@
static void format_address_header (char **h, ADDRESS * a)
p_realloc(h, buflen);
for (count = 0; a; a = a->next, count++) {
p_realloc(h, buflen);
for (count = 0; a; a = a->next, count++) {
-
ADDRESS
*tmp = a->next;
+
address_t
*tmp = a->next;
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
@@
-865,7
+868,7
@@
static int address_header_decode (char **h)
char *s = *h;
int l;
char *s = *h;
int l;
-
ADDRESS
*a = NULL;
+
address_t
*a = NULL;
switch (tolower ((unsigned char) *s)) {
case 'r':
switch (tolower ((unsigned char) *s)) {
case 'r':
@@
-937,7
+940,7
@@
static int address_header_decode (char **h)
format_address_header (h, a);
format_address_header (h, a);
-
rfc822_free_address
(&a);
+
address_delete
(&a);
p_delete(&s);
return 1;
p_delete(&s);
return 1;