projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
65ed14c
..
0c5f8b4
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-10,12
+10,13
@@
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
-#include "mx.h"
#include "copy.h"
#include <lib-crypt/crypt.h>
#include "copy.h"
#include <lib-crypt/crypt.h>
+#include <lib-ui/curses.h>
#include "mutt_idna.h"
static int address_header_decode (char **str);
#include "mutt_idna.h"
static int address_header_decode (char **str);
@@
-32,12
+33,13
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
int this_is_from;
int ignore = 0;
char buf[STRING]; /* should be long enough to get most fields in one pass */
int this_is_from;
int ignore = 0;
char buf[STRING]; /* should be long enough to get most fields in one pass */
- char *
n
l;
+ char *
eo
l;
string_list_t *t;
char **headers;
int hdr_count;
int x;
char *this_one = NULL;
string_list_t *t;
char **headers;
int hdr_count;
int x;
char *this_one = NULL;
+ ssize_t this_one_len = 0, headers_len = 0;
int error;
int curline = 0;
int error;
int curline = 0;
@@
-54,13
+56,13
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
* we can do a more efficient line to line copying
*/
while (ftello (in) < off_end) {
* we can do a more efficient line to line copying
*/
while (ftello (in) < off_end) {
-
n
l = strchr (buf, '\n');
+
eo
l = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (
n
l && buf[0] != ' ' && buf[0] != '\t') {
+ if (
eo
l && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
ignore = 1;
if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
@@
-115,14
+117,14
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
/* Read all the headers into the array */
while (ftello (in) < off_end) {
/* Read all the headers into the array */
while (ftello (in) < off_end) {
-
n
l = strchr (buf, '\n');
+
eo
l = strchr (buf, '\n');
/* Read a line */
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
/* Read a line */
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (
n
l && buf[0] != ' ' && buf[0] != '\t') {
+ if (
eo
l && buf[0] != ' ' && buf[0] != '\t') {
/* set curline to 1 for To:/Cc:/Bcc: and 0 otherwise */
curline = (flags & CH_WEED) && (m_strncmp("To:", buf, 3) == 0 ||
/* set curline to 1 for To:/Cc:/Bcc: and 0 otherwise */
curline = (flags & CH_WEED) && (m_strncmp("To:", buf, 3) == 0 ||
@@
-139,8
+141,9
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
if (!headers[x])
headers[x] = this_one;
else {
if (!headers[x])
headers[x] = this_one;
else {
- p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
- strcat(headers[x], this_one); /* __STRCAT_CHECKED__ */
+ headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1;
+ p_realloc(&headers[x], headers_len);
+ m_strcat(headers[x], headers_len, this_one);
p_delete(&this_one);
}
p_delete(&this_one);
}
@@
-206,13
+209,15
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
* 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) {
* 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) {
- p_realloc(&this_one, m_strlen(this_one) + m_strlen(buf) + 1);
- strcat (this_one, buf); /* __STRCAT_CHECKED__ */
+ this_one_len = m_strlen(this_one) + m_strlen(buf) + 1;
+ p_realloc(&this_one, this_one_len);
+ m_strcat(this_one, this_one_len, buf);
/* only for the first line which doesn't exeeds
* $max_display_recips: abbreviate it */
} else if (curline == MaxDispRecips+1) {
/* only for the first line which doesn't exeeds
* $max_display_recips: abbreviate it */
} else if (curline == MaxDispRecips+1) {
- p_realloc(&this_one, m_strlen(this_one) + 5);
- strcat (this_one, " ...");
+ this_one_len = m_strlen(this_one) + 5;
+ p_realloc(&this_one, this_one_len);
+ m_strcat(this_one, this_one_len, " ...");
}
}
} /* while (ftello (in) < off_end) */
}
}
} /* while (ftello (in) < off_end) */
@@
-227,8
+232,9
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
if (!headers[x])
headers[x] = this_one;
else {
if (!headers[x])
headers[x] = this_one;
else {
- p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1);
- strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
+ headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1;
+ p_realloc(&headers[x], headers_len);
+ m_strcat(headers[x], headers_len, this_one);
p_delete(&this_one);
}
p_delete(&this_one);
}
@@
-238,11
+244,6
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
/* Now output the headers in order */
for (x = 0; x < hdr_count; x++) {
if (headers[x]) {
/* Now output the headers in order */
for (x = 0; x < hdr_count; x++) {
if (headers[x]) {
-#if 0
- if (flags & CH_DECODE)
- rfc2047_decode (&headers[x]);
-#endif
-
/* We couldn't do the prefixing when reading because RFC 2047
* decoding may have concatenated lines.
*/
/* We couldn't do the prefixing when reading because RFC 2047
* decoding may have concatenated lines.
*/
@@
-615,12
+616,12
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
fseeko (fp, cur->offset, 0);
if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
fseeko (fp, cur->offset, 0);
if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
-
fclose (
fp);
+
m_fclose(&
fp);
body_list_wipe(&cur);
return (-1);
}
body_list_wipe(&cur);
body_list_wipe(&cur);
return (-1);
}
body_list_wipe(&cur);
-
fclose (
fp);
+
m_fclose(&
fp);
}
else {
fseeko (fpin, body->offset, 0);
}
else {
fseeko (fpin, body->offset, 0);
@@
-798,12
+799,12
@@
static void format_address_header (char **h, address_t * a)
l = m_strlen(buf);
if (count && linelen + l > 74) {
l = m_strlen(buf);
if (count && linelen + l > 74) {
- strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
+ m_strcpy(cbuf, sizeof(cbuf), "\n\t");
linelen = l + 8;
}
else {
if (a->mailbox) {
linelen = l + 8;
}
else {
if (a->mailbox) {
- strcpy (cbuf, " "); /* __STRCPY_CHECKED__ */
+ m_strcpy(cbuf, sizeof(cbuf), " ");
linelen++;
}
linelen += l;
linelen++;
}
linelen += l;
@@
-811,18
+812,18
@@
static void format_address_header (char **h, address_t * a)
if (!a->group && a->next && a->next->mailbox) {
linelen++;
buflen++;
if (!a->group && a->next && a->next->mailbox) {
linelen++;
buflen++;
- strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
+ m_strcpy(c2buf, sizeof(c2buf), ",");
}
buflen += l + m_strlen(cbuf) + m_strlen(c2buf);
p_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__ */
+ m_strcat(*h, buflen, cbuf);
+ m_strcat(*h, buflen, buf);
+ m_strcat(*h, buflen, c2buf);
}
/* Space for this was allocated in the beginning of this function. */
}
/* Space for this was allocated in the beginning of this function. */
- strcat (*h, "\n"); /* __STRCAT_CHECKED__ */
+ m_strcat(*h, buflen, "\n");
}
static int address_header_decode (char **h)
}
static int address_header_decode (char **h)