X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=5240781bd6f36096da418aa11524a020edc5cbcc;hb=5ee3667d7daf6e7090e3de104c3679259eb26da5;hp=9054963e7a7395a0644955529d115257e81fbcf4;hpb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9054963..5240781 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -15,24 +13,17 @@
 #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 */
+extern char *concataddr ();	/* address formatting but allowing duplicates */
 
 #ifdef LBL
 struct msgs *fmt_current_folder; /* current folder (set by main program) */
@@ -128,10 +119,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 */
@@ -356,6 +348,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)");
 
@@ -795,6 +792,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