X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=1f55a65105410a5cc9dab5557faf4fb82983e817;hb=bcee4360d0113d2cbc71c9b0d13495327894e454;hp=113b8cfff3ed44199da5a565adb32f1935542ab1;hpb=2e5668919988fce4e523cbf2294698841b1106a0;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 113b8cf..1f55a65 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;
 
@@ -679,7 +677,7 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 						} else
 							str = mn->m_text;
 						break;
-				  }
+					}
 				}
 			}
 			break;
@@ -775,12 +773,18 @@ 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) {
-				/* try to break at a comma; failing that,
-				 * break at a space.
-				 */
+				/*
+				** try to break at a comma; failing that,
+				** break at a space.
+				*/
 				lastb = 0; sp = lp + wid;
 				while (sp > lp && (c = *--sp) != ',') {
 					if (! lastb && isspace(c))