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

[mmh] / uip / whom.c

diff --git a/uip/whom.c b/uip/whom.c
index 0451699..3d3eb84 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -10,6 +10,7 @@
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0
@@ -85,7 +86,7 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(1);
 
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
@@ -95,10 +96,10 @@ main(int argc, char **argv)
                                                "%s [switches] file ...",
                                                invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case TOCCSW:
                                toccsw = 1;
@@ -153,10 +154,6 @@ main(int argc, char **argv)
        free(cmd);
        naddrs += n;
 
-       if (toccsw && bccsw) {
-               puts(separator);
-       }
-
        cmd = add("ali -list", NULL);
        if ((n=printbcc()) && alisw) {
                if (!(in = popen(cmd, "r"))) {
@@ -177,7 +174,7 @@ static int
 process(char *file)
 {
         int state, compnum;
-       char *cp;
+       char *cp = NULL;
        char buf[BUFSIZ], name[NAMESZ];
        FILE *in;
 
@@ -314,6 +311,9 @@ printbcc(void)
                        continue;
                }
                if (mp->m_type & HBCC) {
+                       if (!naddrs && toccsw) {
+                               puts(separator);
+                       }
                        naddrs++;
                        printone(mp);
                }