projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgotten debug
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
4368f02
..
66d30b8
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-11,18
+11,22
@@
# 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/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"
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-38,9
+42,8
@@
static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
* below is to avoid creating a HEADER structure in message_handler().
*/
int
* below is to avoid creating a HEADER structure in message_handler().
*/
int
-mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
- const char *prefix)
-{
+mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
+ int flags, const char *prefix) {
int from = 0;
int this_is_from;
int ignore = 0;
int from = 0;
int this_is_from;
int ignore = 0;
@@
-54,8
+57,8
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
int error;
int curline = 0;
int error;
int curline = 0;
- if (ftell (in) != off_start)
- fseek (in, off_start, 0);
+ if (ftell
o
(in) != off_start)
+ fseek
o
(in, off_start, 0);
buf[0] = '\n';
buf[1] = 0;
buf[0] = '\n';
buf[1] = 0;
@@
-66,7
+69,7
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
/* Without these flags to complicate things
* we can do a more efficient line to line copying
*/
/* Without these flags to complicate things
* we can do a more efficient line to line copying
*/
- while (ftell (in) < off_end) {
+ while (ftell
o
(in) < off_end) {
nl = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
nl = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
@@
-75,7
+78,7
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
/* 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;
@@
-127,10
+130,10
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
- headers =
mem_calloc (hdr_count, sizeof (char *)
);
+ headers =
p_new(char *, hdr_count
);
/* Read all the headers into the array */
/* Read all the headers into the array */
- while (ftell (in) < off_end) {
+ while (ftell
o
(in) < off_end) {
nl = strchr (buf, '\n');
/* Read a line */
nl = strchr (buf, '\n');
/* Read a line */
@@
-155,10
+158,9
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
if (!headers[x])
headers[x] = this_one;
else {
if (!headers[x])
headers[x] = this_one;
else {
- mem_realloc (&headers[x], str_len (headers[x]) +
- str_len (this_one) + sizeof (char));
- strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- mem_free (&this_one);
+ p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
+ strcat(headers[x], this_one); /* __STRCAT_CHECKED__ */
+ p_delete(&this_one);
}
this_one = NULL;
}
this_one = NULL;
@@
-166,7
+168,7
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
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;
@@
-207,7
+209,7
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
/* Find x -- the array entry where this header is to be saved */
if (flags & CH_REORDER) {
for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
/* Find x -- the array entry where this header is to be saved */
if (flags & CH_REORDER) {
for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
- if (!ascii_strncasecmp (buf, t->data,
str_len
(t->data))) {
+ if (!ascii_strncasecmp (buf, t->data,
m_strlen
(t->data))) {
debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
break;
}
debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
break;
}
@@
-220,23
+222,21
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
if (!ignore) {
debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
if (!this_one)
if (!ignore) {
debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
if (!this_one)
- this_one =
str_dup
(buf);
+ this_one =
m_strdup
(buf);
/* we do want to see all lines if this header doesn't feature
* abbreviations (curline is 0), $max_display_recips is 0 and
* while the number hasn't reached $max_display_recips yet */
else if (curline == 0 || MaxDispRecips == 0 || ++curline <= MaxDispRecips) {
/* we do want to see all lines if this header doesn't feature
* abbreviations (curline is 0), $max_display_recips is 0 and
* while the number hasn't reached $max_display_recips yet */
else if (curline == 0 || MaxDispRecips == 0 || ++curline <= MaxDispRecips) {
- mem_realloc (&this_one,
- str_len (this_one) + str_len (buf) +
- sizeof (char));
+ p_realloc(&this_one, m_strlen(this_one) + m_strlen(buf) + 1);
strcat (this_one, buf); /* __STRCAT_CHECKED__ */
/* only for the first line which doesn't exeeds
* $max_display_recips: abbreviate it */
} else if (curline == MaxDispRecips+1) {
strcat (this_one, buf); /* __STRCAT_CHECKED__ */
/* only for the first line which doesn't exeeds
* $max_display_recips: abbreviate it */
} else if (curline == MaxDispRecips+1) {
-
mem_realloc (&this_one, str_len
(this_one) + 5);
+
p_realloc(&this_one, m_strlen
(this_one) + 5);
strcat (this_one, " ...");
}
}
strcat (this_one, " ...");
}
}
- } /* while (ftell (in) < off_end) */
+ } /* while (ftell
o
(in) < off_end) */
/* Do we have anything pending? -- XXX, same code as in above in the loop. */
if (this_one) {
/* Do we have anything pending? -- XXX, same code as in above in the loop. */
if (this_one) {
@@
-248,10
+248,9
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
if (!headers[x])
headers[x] = this_one;
else {
if (!headers[x])
headers[x] = this_one;
else {
- mem_realloc (&headers[x], str_len (headers[x]) +
- str_len (this_one) + sizeof (char));
+ p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
-
mem_free
(&this_one);
+
p_delete
(&this_one);
}
this_one = NULL;
}
this_one = NULL;
@@
-304,8
+303,8
@@
mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
/* Free in a separate loop to be sure that all headers are freed
* in case of error. */
for (x = 0; x < hdr_count; x++)
/* Free in a separate loop to be sure that all headers are freed
* in case of error. */
for (x = 0; x < hdr_count; x++)
-
mem_free
(&headers[x]);
-
mem_free
(&headers);
+
p_delete
(&headers[x]);
+
p_delete
(&headers);
if (error)
return (-1);
if (error)
return (-1);
@@
-391,7
+390,7
@@
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
/* Mutt stores references in reverse order, thus we create
* a reordered refs list that we can put in the headers */
for (; listp; listp = listp->next, refs = t) {
/* Mutt stores references in reverse order, thus we create
* a reordered refs list that we can put in the headers */
for (; listp; listp = listp->next, refs = t) {
- t =
(LIST *) mem_malloc (sizeof (LIST)
);
+ t =
p_new(LIST, 1
);
t->data = listp->data;
t->next = refs;
}
t->data = listp->data;
t->next = refs;
}
@@
-402,7
+401,7
@@
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
-
mem_free
(&refs);
+
p_delete
(&refs);
if (fputc ('\n', out) == EOF)
return (-1);
if (fputc ('\n', out) == EOF)
return (-1);
@@
-446,7
+445,7
@@
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
}
if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
}
if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
- fprintf (out, "Content-Length:
" OFF_T_FMT "
\n", h->content->length);
+ fprintf (out, "Content-Length:
%zd
\n", h->content->length);
if (h->lines != 0 || h->content->length == 0)
fprintf (out, "Lines: %d\n", h->lines);
}
if (h->lines != 0 || h->content->length == 0)
fprintf (out, "Lines: %d\n", h->lines);
}
@@
-465,7
+464,7
@@
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
}
/* Count the number of lines and bytes to be deleted in this body*/
}
/* Count the number of lines and bytes to be deleted in this body*/
-static int count_delete_lines (FILE * fp, BODY * b,
LOFF_T
*length,
+static int count_delete_lines (FILE * fp, BODY * b,
off_t
*length,
size_t datelen)
{
int dellines = 0;
size_t datelen)
{
int dellines = 0;
@@
-473,7
+472,7
@@
static int count_delete_lines (FILE * fp, BODY * b, LOFF_T *length,
int ch;
if (b->deleted) {
int ch;
if (b->deleted) {
- fseek (fp, b->offset, SEEK_SET);
+ fseek
o
(fp, b->offset, SEEK_SET);
for (l = b->length; l; l--) {
ch = getc (fp);
if (ch == EOF)
for (l = b->length; l; l--) {
ch = getc (fp);
if (ch == EOF)
@@
-518,12
+517,12
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
{
char prefix[SHORT_STRING];
STATE s;
{
char prefix[SHORT_STRING];
STATE s;
-
LOFF_T
new_offset = -1;
+
off_t
new_offset = -1;
int rc = 0;
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
int rc = 0;
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);
@@
-535,22
+534,22
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
-
LOFF_T
new_length = body->length;
+
off_t
new_length = body->length;
char date[SHORT_STRING];
mutt_make_date (date, sizeof (date));
char date[SHORT_STRING];
mutt_make_date (date, sizeof (date));
- date[5] = date[
str_len
(date) - 1] = '\"';
+ date[5] = date[
m_strlen
(date) - 1] = '\"';
/* Count the number of lines and bytes to be deleted */
/* Count the number of lines and bytes to be deleted */
- fseek (fpin, body->offset, SEEK_SET);
+ fseek
o
(fpin, body->offset, SEEK_SET);
new_lines = hdr->lines -
new_lines = hdr->lines -
- count_delete_lines (fpin, body, &new_length,
str_len
(date));
+ count_delete_lines (fpin, body, &new_length,
m_strlen
(date));
/* Copy the headers */
if (mutt_copy_header (fpin, hdr, fpout,
chflags | CH_NOLEN | CH_NONEWLINE, NULL))
return -1;
/* Copy the headers */
if (mutt_copy_header (fpin, hdr, fpout,
chflags | CH_NOLEN | CH_NONEWLINE, NULL))
return -1;
- fprintf (fpout, "Content-Length:
" OFF_T_FMT "
\n", new_length);
+ fprintf (fpout, "Content-Length:
%zd
\n", new_length);
if (new_lines <= 0)
new_lines = 0;
else
if (new_lines <= 0)
new_lines = 0;
else
@@
-560,13
+559,13
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
new_offset = ftello (fpout);
/* Copy the body */
new_offset = ftello (fpout);
/* Copy the body */
- fseek (fpin, body->offset, SEEK_SET);
+ fseek
o
(fpin, body->offset, SEEK_SET);
if (copy_delete_attach (body, fpin, fpout, date))
return -1;
#ifdef DEBUG
{
if (copy_delete_attach (body, fpin, fpout, date))
return -1;
#ifdef DEBUG
{
-
LOFF_T
fail = ((ftello (fpout) - new_offset) - new_length);
+
off_t
fail = ((ftello (fpout) - new_offset) - new_length);
if (fail) {
mutt_error ("The length calculation was wrong by %ld bytes", fail);
if (fail) {
mutt_error ("The length calculation was wrong by %ld bytes", fail);
@@
-607,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)
@@
-651,7
+650,7
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
mutt_write_mime_header (cur, fpout);
fputc ('\n', fpout);
mutt_write_mime_header (cur, fpout);
fputc ('\n', fpout);
- fseek (fp, cur->offset, 0);
+ fseek
o
(fp, cur->offset, 0);
if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
fclose (fp);
mutt_free_body (&cur);
if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
fclose (fp);
mutt_free_body (&cur);
@@
-661,7
+660,7
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
fclose (fp);
}
else {
fclose (fp);
}
else {
- fseek (fpin, body->offset, 0);
+ fseek
o
(fpin, body->offset, 0);
if (flags & M_CM_PREFIX) {
int c;
size_t bytes = body->length;
if (flags & M_CM_PREFIX) {
int c;
size_t bytes = body->length;
@@
-726,7
+725,7
@@
_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
MESSAGE *msg;
int r;
MESSAGE *msg;
int r;
- fseek(fpin, hdr->offset, 0);
+ fseek
o
(fpin, hdr->offset, 0);
if (fgets (buf, sizeof (buf), fpin) == NULL)
return (-1);
if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
if (fgets (buf, sizeof (buf), fpin) == NULL)
return (-1);
if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
@@
-773,23
+772,23
@@
static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
for (part = b->parts; part; part = part->next) {
if (part->deleted || part->parts) {
/* Copy till start of this part */
for (part = b->parts; part; part = part->next) {
if (part->deleted || part->parts) {
/* Copy till start of this part */
- if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin)))
+ if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell
o
(fpin)))
return -1;
if (part->deleted) {
fprintf (fpout,
"Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
return -1;
if (part->deleted) {
fprintf (fpout,
"Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
- "\texpiration=%s; length=
" OFF_T_FMT "
\n"
+ "\texpiration=%s; length=
%zd
\n"
"\n", date + 5, part->length);
if (ferror (fpout))
return -1;
/* Copy the original mime headers */
"\n", date + 5, part->length);
if (ferror (fpout))
return -1;
/* Copy the original mime headers */
- if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin)))
+ if (mutt_copy_bytes (fpin, fpout, part->offset - ftell
o
(fpin)))
return -1;
/* Skip the deleted body */
return -1;
/* Skip the deleted body */
- fseek (fpin, part->offset + part->length, SEEK_SET);
+ fseek
o
(fpin, part->offset + part->length, SEEK_SET);
}
else {
if (copy_delete_attach (part, fpin, fpout, date))
}
else {
if (copy_delete_attach (part, fpin, fpout, date))
@@
-799,7
+798,7
@@
static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
}
/* Copy the last parts */
}
/* Copy the last parts */
- if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin)))
+ if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell
o
(fpin)))
return -1;
return 0;
return -1;
return 0;
@@
-814,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];
@@
-822,20
+821,20
@@
static void format_address_header (char **h, ADDRESS * a)
int l, linelen, buflen, count;
int l, linelen, buflen, count;
- linelen =
str_len
(*h);
+ linelen =
m_strlen
(*h);
buflen = linelen + 3;
buflen = linelen + 3;
-
mem_realloc
(h, buflen);
+
p_realloc
(h, buflen);
for (count = 0; a; a = a->next, count++) {
for (count = 0; a; a = a->next, count++) {
-
ADDRESS
*tmp = a->next;
+
address_t
*tmp = a->next;
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
rfc822_write_address (buf, sizeof (buf), a, 0);
a->next = tmp;
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
rfc822_write_address (buf, sizeof (buf), a, 0);
a->next = tmp;
- l =
str_len
(buf);
+ l =
m_strlen
(buf);
if (count && linelen + l > 74) {
strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
linelen = l + 8;
if (count && linelen + l > 74) {
strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
linelen = l + 8;
@@
-853,8
+852,8
@@
static void format_address_header (char **h, ADDRESS * a)
strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
}
strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
}
- buflen += l +
str_len (cbuf) + str_len
(c2buf);
-
mem_realloc
(h, buflen);
+ buflen += l +
m_strlen(cbuf) + m_strlen
(c2buf);
+
p_realloc
(h, buflen);
strcat (*h, cbuf); /* __STRCAT_CHECKED__ */
strcat (*h, buf); /* __STRCAT_CHECKED__ */
strcat (*h, c2buf); /* __STRCAT_CHECKED__ */
strcat (*h, cbuf); /* __STRCAT_CHECKED__ */
strcat (*h, buf); /* __STRCAT_CHECKED__ */
strcat (*h, c2buf); /* __STRCAT_CHECKED__ */
@@
-869,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,14
+936,12
@@
static int address_header_decode (char **h)
mutt_addrlist_to_local (a);
rfc2047_decode_adrlist (a);
mutt_addrlist_to_local (a);
rfc2047_decode_adrlist (a);
- *h = mem_calloc (1, l + 2);
-
- strfcpy (*h, s, l + 1);
+ *h = p_dupstr(s, l + 1);
format_address_header (h, a);
format_address_header (h, a);
-
rfc822_free_address
(&a);
+
address_delete
(&a);
-
mem_free
(&s);
+
p_delete
(&s);
return 1;
}
return 1;
}