Move #include from h/mh.h to source files

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 113b8cf..0616d17 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -14,6 +14,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/fmt_compile.h>
+#include <ctype.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -25,8 +26,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 +678,7 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                                                } else
                                                        str = mn->m_text;
                                                break;
-                                 }
+                                       }
                                }
                        }
                        break;
@@ -775,12 +774,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))