X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=5e4bc8865337276f928722195402941294e1c8e5;hb=731107f0ab2f3878743fea49910478c6b21bde1b;hp=f689300ff07773e32159c64ee4f538eff733f7d4;hpb=aec3e4eb82ab61699f1539ad7b62f4c3ecdbf4ea;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index f689300..5e4bc88 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -25,9 +25,6 @@
 #  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
@@ -316,6 +313,27 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	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;