projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update README.developers with the correct version of autoconf we need.
[mmh]
/
sbr
/
fmt_scan.c
diff --git
a/sbr/fmt_scan.c
b/sbr/fmt_scan.c
index
8d03836
..
5240781
100644
(file)
--- a/
sbr/fmt_scan.c
+++ b/
sbr/fmt_scan.c
@@
-13,24
+13,17
@@
#include <h/tws.h>
#include <h/fmt_compile.h>
#include <h/tws.h>
#include <h/fmt_compile.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <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
#endif
+#include <time.h>
#ifdef MULTIBYTE_SUPPORT
# include <wctype.h>
# include <wchar.h>
#endif
#ifdef MULTIBYTE_SUPPORT
# include <wctype.h>
# include <wchar.h>
#endif
-#define NFMTS MAXARGS
-
extern char *formataddr (); /* hook for custom address formatting */
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) */
#ifdef LBL
struct msgs *fmt_current_folder; /* current folder (set by main program) */
@@
-355,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_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)");
case FT_STRFW:
adios (NULL, "internal error (FT_STRFW)");
@@
-794,6
+792,11
@@
fmt_scan (struct format *format, char *scanl, int width, int *dat)
str = formataddr (savestr, str);
break;
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
case FT_PUTADDR:
/* output the str register as an address component,
* splitting it into multiple lines if necessary. The