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

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index c3d265a..5e4bc88 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -2,11 +2,12 @@
 /*
  * fmt_scan.c -- format string interpretation
  *
- * $Id$
- *
  * 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>
@@ -15,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
@@ -128,10 +120,11 @@ cpnumber(char **dest, int num, unsigned int wid, char fill, size_t n) {
 static void
 cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
     int remaining;     /* remaining output width available */
-    int c, ljust, w;
+    int c, ljust;
     int end;           /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */
+    int w;
     wchar_t wide_char;
 #endif
     char *sp;          /* current position in source string */
@@ -160,7 +153,10 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 		sp += char_len;
 #else
 	    end--;
-	    if (iscntrl(*sp) || isspace(*sp)) {
+            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
+               intentionally warns if they are passed a char. */
+            int c = *sp;
+	    if (iscntrl(c) || isspace(c)) {
 		sp++;
 #endif
 		if (!prevCtrl) {
@@ -288,7 +284,7 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
 	    || !(cp = strchr(mbox += idx + strlen (key), '/')))
 	return 0;
 
-    snprintf (buffer, buffer_len, "%*.*s", cp - mbox, cp - mbox, mbox);
+    snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
     return 1;
 }
 
@@ -297,7 +293,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 {
     char *cp, *ep;
     unsigned char *sp;
-    char *savestr;
+    char *savestr = NULL;
     unsigned char *str = NULL;
     char buffer[BUFSIZ], buffer2[BUFSIZ];
     int i, c, ljust, n;
@@ -317,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;
@@ -356,6 +373,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)");
 
@@ -508,13 +530,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;
@@ -795,6 +817,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
@@ -813,6 +840,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) {