X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=ec086a1371ae034cb9ced86a36782761c0c1d639;hb=b33ba7a7953d06a123ee59811903f0eb7f69e120;hp=5103dbd772697372477cda28ae083248f9611872;hpb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 5103dbd..ec086a1 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -25,8 +25,6 @@
 #  include <wchar.h>
 #endif
 
-extern char *formataddr();  /* hook for custom address formatting */
-
 extern int fmt_norm;  /* defined in sbr/fmt_def.c = AD_NAME */
 struct mailname fmt_mnull;
 
@@ -607,10 +605,8 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 			value = fmt->f_comp->c_tws->tw_flags & TW_DST;
 			break;
 		case FT_LS_822DATE:
-			str = dasctime(fmt->f_comp->c_tws , TW_ZONE);
-			break;
 		case FT_LS_PRETTY:
-			str = dasctime(fmt->f_comp->c_tws, TW_NULL);
+			str = dasctime(fmt->f_comp->c_tws);
 			break;
 
 		case FT_LS_PERS:
@@ -777,6 +773,11 @@ 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) {