X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=567d0e40e02b94a1a6c3b1872e5ad0ce282193ea;hp=d9a6fb97a0e82580a2f7d95d40f5284d9f2863da;hb=be393b838c5e0b8dfe9bedcc7a4a63f05caae7c4;hpb=debd2491451020d9fd5f0440bb2dada0b9eac6e7 diff --git a/copy.c b/copy.c index d9a6fb9..567d0e4 100644 --- a/copy.c +++ b/copy.c @@ -72,7 +72,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; - if (!from && safe_strncmp ("From ", buf, 5) == 0) { + if (!from && str_ncmp ("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; from = 1; @@ -124,7 +124,7 @@ 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")); - headers = safe_calloc (hdr_count, sizeof (char *)); + headers = mem_calloc (hdr_count, sizeof (char *)); /* Read all the headers into the array */ while (ftell (in) < off_end) { @@ -146,10 +146,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, if (!headers[x]) headers[x] = this_one; else { - safe_realloc (&headers[x], mutt_strlen (headers[x]) + - mutt_strlen (this_one) + sizeof (char)); + mem_realloc (&headers[x], str_len (headers[x]) + + str_len (this_one) + sizeof (char)); strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - FREE (&this_one); + mem_free (&this_one); } this_one = NULL; @@ -157,7 +157,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, ignore = 1; this_is_from = 0; - if (!from && safe_strncmp ("From ", buf, 5) == 0) { + if (!from && str_ncmp ("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; this_is_from = from = 1; @@ -198,7 +198,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++) { - if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) { + if (!ascii_strncasecmp (buf, t->data, str_len (t->data))) { debug_print (2, ("Reorder: %s matches %s\n", t->data, buf)); break; } @@ -211,10 +211,10 @@ 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) - this_one = safe_strdup (buf); + this_one = str_dup (buf); else { - safe_realloc (&this_one, - mutt_strlen (this_one) + mutt_strlen (buf) + + mem_realloc (&this_one, + str_len (this_one) + str_len (buf) + sizeof (char)); strcat (this_one, buf); /* __STRCAT_CHECKED__ */ } @@ -231,10 +231,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, if (!headers[x]) headers[x] = this_one; else { - safe_realloc (&headers[x], mutt_strlen (headers[x]) + - mutt_strlen (this_one) + sizeof (char)); + mem_realloc (&headers[x], str_len (headers[x]) + + str_len (this_one) + sizeof (char)); strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - FREE (&this_one); + mem_free (&this_one); } this_one = NULL; @@ -287,8 +287,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 (&headers[x]); - FREE (&headers); + mem_free (&headers[x]); + mem_free (&headers); if (error) return (-1); @@ -374,7 +374,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) { - t = (LIST *) safe_malloc (sizeof (LIST)); + t = (LIST *) mem_malloc (sizeof (LIST)); t->data = listp->data; t->next = refs; } @@ -385,7 +385,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) - FREE (&refs); + mem_free (&refs); if (fputc ('\n', out) == EOF) return (-1); @@ -521,12 +521,12 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, char date[SHORT_STRING]; mutt_make_date (date, sizeof (date)); - date[5] = date[mutt_strlen (date) - 1] = '\"'; + date[5] = date[str_len (date) - 1] = '\"'; /* Count the number of lines and bytes to be deleted */ fseek (fpin, body->offset, SEEK_SET); new_lines = hdr->lines - - count_delete_lines (fpin, body, &new_length, mutt_strlen (date)); + count_delete_lines (fpin, body, &new_length, str_len (date)); /* Copy the headers */ if (mutt_copy_header (fpin, hdr, fpout, @@ -804,11 +804,11 @@ static void format_address_header (char **h, ADDRESS * a) int l, linelen, buflen, count; - linelen = mutt_strlen (*h); + linelen = str_len (*h); buflen = linelen + 3; - safe_realloc (h, buflen); + mem_realloc (h, buflen); for (count = 0; a; a = a->next, count++) { ADDRESS *tmp = a->next; @@ -817,7 +817,7 @@ static void format_address_header (char **h, ADDRESS * a) rfc822_write_address (buf, sizeof (buf), a, 0); a->next = tmp; - l = mutt_strlen (buf); + l = str_len (buf); if (count && linelen + l > 74) { strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */ linelen = l + 8; @@ -835,8 +835,8 @@ static void format_address_header (char **h, ADDRESS * a) strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */ } - buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf); - safe_realloc (h, buflen); + buflen += l + str_len (cbuf) + str_len (c2buf); + mem_realloc (h, buflen); strcat (*h, cbuf); /* __STRCAT_CHECKED__ */ strcat (*h, buf); /* __STRCAT_CHECKED__ */ strcat (*h, c2buf); /* __STRCAT_CHECKED__ */ @@ -919,7 +919,7 @@ static int address_header_decode (char **h) mutt_addrlist_to_local (a); rfc2047_decode_adrlist (a); - *h = safe_calloc (1, l + 2); + *h = mem_calloc (1, l + 2); strfcpy (*h, s, l + 1); @@ -927,6 +927,6 @@ static int address_header_decode (char **h) rfc822_free_address (&a); - FREE (&s); + mem_free (&s); return 1; }