X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=3f004e5e709f713f0c704cb40ca05138320c4c4e;hb=721fb2418b2e76c57e550b2f3ecf1bfefa8529d9;hp=9c1eb16aecbc8eba89d6a7e3c3dfc5bf9b2ffdf0;hpb=7b3154538d24958c2e3ed0e20e80bb33d3d98a3a;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9c1eb16..3f004e5 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -25,15 +25,13 @@
 #  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
 
 extern int fmt_norm;		/* defined in sbr/fmt_def.c = AD_NAME */
-struct mailname fmt_mnull;
+struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
+			      NULL, NULL };
 
 /*
  * static prototypes
@@ -154,10 +152,11 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 	    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
@@ -315,6 +314,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;
@@ -821,6 +841,10 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	    sp = fmt->f_text;
 	    indent = strlen (sp);
 	    wid -= indent;
+	    if (wid <= 0) {
+	    	adios(NULL, "putaddr -- num register (%d) must be greater "
+			    "than label width (%d)", value, indent);
+	    }
 	    while( (c = *sp++) && cp < ep)
 		*cp++ = c;
 	    while (len > wid) {