X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=3f004e5e709f713f0c704cb40ca05138320c4c4e;hb=5ccbd49adba7e6d48f4094fa6eade7a7fb8ec4cf;hp=8d0383608c03053b66e24d615526d791de6c259e;hpb=648c015ca70b15edf41d80aa87314ade3252d140;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8d03836..3f004e5 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -5,6 +5,9 @@
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
+ *
+ * This is the engine that processes the format instructions created by
+ * fmt_compile (found in fmt_compile.c).
  */
 
 #include <h/mh.h>
@@ -13,31 +16,22 @@
 #include <h/tws.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 #ifdef MULTIBYTE_SUPPORT
 #  include <wctype.h>
 #  include <wchar.h>
 #endif
 
-#define	NFMTS MAXARGS
-
-extern char *formataddr ();	/* hook for custom address formatting */
-
 #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
@@ -158,8 +152,12 @@ 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--;
-	    if (iscntrl(*sp) || isspace(*sp)) {
+            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
+               intentionally warns if they are passed a char. */
+            c = *sp;
+	    if (iscntrl(c) || isspace(c)) {
 		sp++;
 #endif
 		if (!prevCtrl) {
@@ -316,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;
@@ -355,6 +374,11 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	case FT_STRF:
 	    cptrimmed (&cp, str, fmt->f_width, fmt->f_fill, ep - cp);
 	    break;
+	case FT_STRLIT:
+	    sp = str;
+	    while ((c = *sp++) && cp < ep)
+		*cp++ = c;
+	    break;
 	case FT_STRFW:
 	    adios (NULL, "internal error (FT_STRFW)");
 
@@ -507,13 +531,13 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 			    ljust++;
 		    }
 
-		    if (!ljust && i > 0 && strlen(str) > i)
+		    if (!ljust && i > 0 && (int) strlen(str) > i)
 			    str[i] = '\0';
 		    xp = str;
 		    xp += strlen(str) - 1;
 		    while (xp > str && isspace(*xp))
 			    *xp-- = '\0';
-		    if (ljust && i > 0 && strlen(str) > i)
+		    if (ljust && i > 0 && (int) strlen(str) > i)
 			str += strlen(str) - i;
 	    }
 	    break;
@@ -794,6 +818,11 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	    str = formataddr (savestr, str);
 	    break;
 
+	case FT_CONCATADDR:
+	    /* The same as formataddr, but doesn't do duplicate suppression */
+	    str = concataddr (savestr, str);
+	    break;
+
 	case FT_PUTADDR:
 	    /* output the str register as an address component,
 	     * splitting it into multiple lines if necessary.  The
@@ -812,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) {