# include <wchar.h>
#endif
-extern char *formataddr (); /* hook for custom address formatting */
-extern char *concataddr (); /* address formatting but allowing duplicates */
-
#ifdef LBL
struct msgs *fmt_current_folder; /* current folder (set by main program) */
#endif
if (iswcntrl(wide_char) || iswspace(wide_char)) {
sp += char_len;
#else
+ int c;
end--;
/* isnctrl(), etc., take an int argument. Cygwin's ctype.h
intentionally warns if they are passed a char. */
- int c = *sp;
+ c = *sp;
if (iscntrl(c) || isspace(c)) {
sp++;
#endif
case FT_PARSEDATE:
fmt->f_comp->c_flags &= ~CF_PARSED;
break;
+ case FT_COMP:
+ case FT_COMPF:
+ case FT_LS_COMP:
+ case FT_LS_DECODECOMP:
+ /*
+ * Trim these components of any newlines.
+ *
+ * But don't trim the "body" and "text" components.
+ */
+
+ comp = fmt->f_comp;
+
+ if (! (comp->c_flags & CF_TRIMMED) && comp->c_text) {
+ i = strlen(comp->c_text);
+ if (comp->c_text[i - 1] == '\n' &&
+ strcmp(comp->c_name, "body") != 0 &&
+ strcmp(comp->c_name, "text") != 0)
+ comp->c_text[i - 1] = '\0';
+ comp->c_flags |= CF_TRIMMED;
+ }
+ break;
}
fmt = format;