projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let m_strformat accept NULL formats.
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
c63ab8d
..
55a3f4f
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-39,6
+39,7
@@
mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
int hdr_count;
int x;
char *this_one = NULL;
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;
@@
-140,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);
}
@@
-207,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) */
@@
-228,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);
}
@@
-239,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.
*/
@@
-318,7
+318,7
@@
int
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
const char *prefix)
{
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
const char *prefix)
{
- char buffer[S
HORT_S
TRING];
+ char buffer[STRING];
if (h->env)
flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
if (h->env)
flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
@@
-329,7
+329,7
@@
mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
return (-1);
if (flags & CH_TXTPLAIN) {
return (-1);
if (flags & CH_TXTPLAIN) {
- char chsbuf[S
HORT_S
TRING];
+ char chsbuf[STRING];
fputs ("MIME-Version: 1.0\n", out);
fputs ("Content-Transfer-Encoding: 8bit\n", out);
fputs ("MIME-Version: 1.0\n", out);
fputs ("Content-Transfer-Encoding: 8bit\n", out);
@@
-494,7
+494,7
@@
int
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
int flags, int chflags)
{
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
int flags, int chflags)
{
- char prefix[S
HORT_S
TRING];
+ char prefix[STRING];
STATE s;
off_t new_offset = -1;
int rc = 0;
STATE s;
off_t new_offset = -1;
int rc = 0;
@@
-514,7
+514,7
@@
_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
off_t new_length = body->length;
else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
off_t new_length = body->length;
- char date[S
HORT_S
TRING];
+ char date[STRING];
mutt_make_date (date, sizeof (date));
date[5] = date[m_strlen(date) - 1] = '\"';
mutt_make_date (date, sizeof (date));
date[5] = date[m_strlen(date) - 1] = '\"';
@@
-616,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);
@@
-794,17
+794,17
@@
static void format_address_header (char **h, address_t * a)
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
- rfc822_
write_address
(buf, sizeof (buf), a, 0);
+ rfc822_
addrcat
(buf, sizeof (buf), a, 0);
a->next = tmp;
l = m_strlen(buf);
if (count && linelen + l > 74) {
a->next = tmp;
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;
@@
-812,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)