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

diff --git a/uip/whom.c b/uip/whom.c
index 0451699..fb77ab3 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -85,7 +85,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 +95,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 +153,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 +173,7 @@ static int
 process(char *file)
 {
         int state, compnum;
-	char *cp;
+	char *cp = NULL;
 	char buf[BUFSIZ], name[NAMESZ];
 	FILE *in;
 
@@ -314,6 +310,9 @@ printbcc(void)
 			continue;
 		}
 		if (mp->m_type & HBCC) {
+			if (!naddrs && toccsw) {
+				puts(separator);
+			}
 			naddrs++;
 			printone(mp);
 		}