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

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9784919..5240781 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -22,9 +22,8 @@
 #  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) */
@@ -349,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)");
 
@@ -788,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