X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhom.c;h=3d3eb8464ebb937aca6a84ebd15bf03e6efb28ad;hp=0451699b545de152d0337fd8330887739ac3c44f;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=204c305913a20d207cba063ec2da8d0275d2da5d

diff --git a/uip/whom.c b/uip/whom.c
index 0451699..3d3eb84 100644
--- 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);
 		}