From: David Levine <levinedl@acm.org>
Date: Thu, 7 Jun 2012 02:08:53 +0000 (-0500)
Subject: Changed exit status of each nmh command's -version and -help switches
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=cff8de7654cf393a494b01a587bd4d503d15a5e3;p=mmh

Changed exit status of each nmh command's -version and -help switches
from 1 to 0.
---

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 226d1fb9..825f992e 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -1,2 +1,6 @@
 Things to add to the release notes for the next full release:
 
+Backward incompatibilities:
+-- Changed exit status of each nmh command's -version and -help
+   switches from 1 to 0.
+
diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 573020e3..bdab7155 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -31,20 +31,17 @@ Usage: mhparam [profile-components] [switches]
   -version
   -help
 EOF
-# The exit status is 1 with -help, so temporarily disable -e.
-set +e
+
+# check -help
 mhparam -help >$actual 2>&1
-set -e
 check $expected $actual
 
-# check -version, which returns non-zero exit status
-set +e
+# check -version
 case `mhparam -v` in
   mhparam\ --*) ;;
   *           ) echo "$0: mhparam -v generated unexpected output" 1>&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
-set -e
 
 # check unknown option
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 84f14e2b..9bb1207a 100755
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -27,20 +27,17 @@ Usage: mhpath [+folder] [msgs] [switches]
   -version
   -help
 EOF
-# The exit status is 1 with -help, so temporarily disable -e.
-set +e
+
+# check -help
 mhpath -help > $actual 2>&1
-set -e
 check $expected $actual
 
-# check -version, which returns non-zero exit status
-set +e
+# check -version
 case `mhpath -v` in
   mhpath\ --*) ;;
   *          ) echo "$0: mhpath -v generated unexpected output" 1>&2
                failed=`expr ${failed:-0} + 1`;;
 esac
-set -e
 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"
diff --git a/uip/ali.c b/uip/ali.c
index 41f92a6e..61ab6b21 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -87,10 +87,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] aliases ...",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version (invo_name);
-		    done (1);
+		    done (0);
 
 		case ALIASW: 
 		    if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/anno.c b/uip/anno.c
index ab15a4a0..24726d7f 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -128,10 +128,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case COMPSW:
 		    if (comp)
diff --git a/uip/ap.c b/uip/ap.c
index b0934fbc..b5b0c5b9 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -82,10 +82,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version (invo_name);
-		    done (1);
+		    done (0);
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
diff --git a/uip/burst.c b/uip/burst.c
index 980972e6..6316e136 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -86,10 +86,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case INPLSW: 
 		inplace++;
diff --git a/uip/comp.c b/uip/comp.c
index 7c72c7c4..29ca1b77 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -119,10 +119,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case EDITRSW: 
 		    if (!(ed = *argp++) || *ed == '-')
diff --git a/uip/conflict.c b/uip/conflict.c
index a3bd1d7b..2324c650 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -92,10 +92,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [aliasfiles ...]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case MAILSW: 
 		    if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/dist.c b/uip/dist.c
index 39fb07b1..40732dce 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -122,10 +122,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ANNOSW: 
 		    anot++;
diff --git a/uip/dp.c b/uip/dp.c
index 4e9c5cb8..a66beed8 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -74,10 +74,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] dates ...",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
diff --git a/uip/flist.c b/uip/flist.c
index 8d8b92e1..b4aff9cd 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -165,10 +165,10 @@ main(int argc, char **argv)
 		snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]",
 			invo_name);
 		print_help(buf, switches, 1);
-		done(1);
+		done(0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case SEQSW:
 		if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 26a6e58c..0b3283d2 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -72,10 +72,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
diff --git a/uip/folder.c b/uip/folder.c
index 0676bea0..aea20f4a 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -151,10 +151,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ALLSW: 
 		    all = 1;
diff --git a/uip/forw.c b/uip/forw.c
index cd51fd19..a04ebd6f 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -167,10 +167,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ANNOSW: 
 		    anot++;
diff --git a/uip/inc.c b/uip/inc.c
index edb288f1..15aef0e8 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -260,10 +260,10 @@ main (int argc, char **argv)
 	    case HELPSW: 
 		snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case AUDSW: 
 		if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/install-mh.c b/uip/install-mh.c
index c4847711..2cf9081c 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -61,10 +61,10 @@ main (int argc, char **argv)
 		case HELPSW:
 		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case AUTOSW:
 		    autof++;
diff --git a/uip/mark.c b/uip/mark.c
index 6ffc2b1a..22a12ee3 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -84,10 +84,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			  invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case ADDSW: 
 		addsw++;
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 020512d7..c612fc55 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -157,10 +157,10 @@ main (int argc, char **argv)
 	    case HELPSW: 
 		snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case RCACHESW:
 		icachesw = &rcachesw;
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 312705ad..72b91d1d 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -151,10 +151,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case RCACHESW:
 		icachesw = &rcachesw;
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index df0a223b..36e78d3f 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -370,10 +370,10 @@ mhl (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
 		    print_help (buf, mhlswitches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case BELLSW: 
 		    bellflg = 1;
diff --git a/uip/mhmail.c b/uip/mhmail.c
index f5e5384a..76e9e800 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -84,10 +84,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [addrs ... [switches]]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FROMSW: 
 		    if (!(from = *argp++) || *from == '-')
diff --git a/uip/mhn.c b/uip/mhn.c
index 3d8801ee..d8826a12 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -240,10 +240,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case AUTOSW:
 		autosw++;
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 90d17fa2..9e6e05c8 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -107,10 +107,10 @@ main(int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case COMPSW:
 		    components = 1;
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 23ca5428..bb77996c 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -55,10 +55,10 @@ main(int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 	    }
 	}
 	if (*cp == '+' || *cp == '@') {
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 0d396b43..3db6abdb 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -167,10 +167,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case RCACHESW:
 		icachesw = &rcachesw;
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 7814dd27..41e62c7d 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -145,10 +145,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case AUTOSW:
 		autosw++;
diff --git a/uip/mhtest.c b/uip/mhtest.c
index e5c4545d..caaf7af8 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -147,10 +147,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case RCACHESW:
 		icachesw = &rcachesw;
diff --git a/uip/msgchk.c b/uip/msgchk.c
index 4cfb5988..43ca792f 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -122,10 +122,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DATESW:
 		    datesw++;
diff --git a/uip/msh.c b/uip/msh.c
index 03584f6d..b3aa3a10 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -235,10 +235,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case IDSW: 
 		    if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/new.c b/uip/new.c
index 38c8f0b0..10854dc9 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -438,10 +438,10 @@ main(int argc, char **argv)
 		snprintf (help, sizeof(help), "%s [switches] [sequences]",
 			  invo_name);
 		print_help (help, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case FOLDERSSW:
 		if (!(folders = *argp++) || *folders == '-')
diff --git a/uip/packf.c b/uip/packf.c
index c3654409..cd003dd7 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -75,10 +75,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FILESW: 
 		    if (file)
diff --git a/uip/pick.c b/uip/pick.c
index bd17c455..fb631112 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -113,11 +113,11 @@ main (int argc, char **argv)
 			  invo_name);
 		print_help (buf, switches, 1);
 		listsw = 0;	/* HACK */
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
 		listsw = 0;	/* HACK */
-		done (1);
+		done (0);
 
 	    case CCSW: 
 	    case DATESW: 
diff --git a/uip/post.c b/uip/post.c
index c9b4c051..11162996 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -343,10 +343,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case LIBSW:
 		    if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/prompter.c b/uip/prompter.c
index 981e8201..795e4724 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -109,10 +109,10 @@ main (int argc, char **argv)
 		    snprintf (buffer, sizeof(buffer), "%s [switches] file",
 			invo_name);
 		    print_help (buffer, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ERASESW: 
 		    if (!(erasep = *argp++) || *erasep == '-')
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index edbf65ff..8ff0365b 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -74,10 +74,10 @@ main (int argc, char **argv)
 			"%s [switches] [switches for postproc] address ...",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 0b4dc9fc..f9e5bbb6 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -63,10 +63,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case MBOXSW:
 		    mbx_style = MBOX_FORMAT;
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 57091b4a..acf54beb 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -88,10 +88,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
 			  invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case SEQSW: 
 		if (!(cp = *argp++) || *cp == '-')
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 63a97b9a..29f2dd9d 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -109,10 +109,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case BIFFSW:
 		    biff = 1;
diff --git a/uip/refile.c b/uip/refile.c
index 25f76299..2bd12ed8 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -100,10 +100,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...",
 			  invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case LINKSW: 
 		linkf++;
diff --git a/uip/repl.c b/uip/repl.c
index 07f25a89..c387da75 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -181,7 +181,7 @@ main (int argc, char **argv)
 		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case GROUPSW:
 		    groupreply++;
diff --git a/uip/rmf.c b/uip/rmf.c
index 5631f785..c9a04f55 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -59,10 +59,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case INTRSW: 
 		    interactive = 1;
diff --git a/uip/rmm.c b/uip/rmm.c
index 7680008d..28c26fb4 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -58,10 +58,10 @@ main (int argc, char **argv)
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			  invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case UNLINKSW:
 		unlink_msgs++;
diff --git a/uip/scan.c b/uip/scan.c
index 077f824a..f49aa60f 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -99,10 +99,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case CLRSW: 
 		    clearflag++;
diff --git a/uip/send.c b/uip/send.c
index 577abacd..6d075c1d 100755
--- a/uip/send.c
+++ b/uip/send.c
@@ -198,10 +198,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [file] [switches]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DRAFTSW: 
 		    msgs[msgp++] = draft;
diff --git a/uip/show.c b/uip/show.c
index 8e581e77..ad9b1233 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -105,10 +105,10 @@ main (int argc, char **argv)
 			"%s [+folder] %s[switches] [switches for showproc]",
 			invo_name, mode == SHOW ? "[msgs] ": "");
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DRFTSW: 
 		    if (file)
diff --git a/uip/slocal.c b/uip/slocal.c
index cc3c8727..80620a7a 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -225,10 +225,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf),
 			"%s [switches] [address info sender]", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ADDRSW: 
 		    if (!(addr = *argp++))/* allow -xyz arguments */
diff --git a/uip/sortm.c b/uip/sortm.c
index 9e8da9f6..607a7c27 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -103,10 +103,10 @@ main (int argc, char **argv)
 		snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case DATESW:
 		if (datesw)
diff --git a/uip/spost.c b/uip/spost.c
index 4133f866..fef583e5 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -224,10 +224,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DEBUGSW: 
 		    debug++;
diff --git a/uip/viamail.c b/uip/viamail.c
index 12412c74..6e47ea53 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -91,10 +91,10 @@ main (int argc, char **argv)
 	    case HELPSW: 
 		snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
     
 	    case TOSW:
 		if (!(f1 = *argp++))
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ddfc998c..bb1e6b4a 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -176,10 +176,10 @@ WhatNow (int argc, char **argv)
 	    case HELPSW:
 		snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 		print_help (buf, whatnowswitches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case DFOLDSW:
 		if (dfolder)
diff --git a/uip/whom.c b/uip/whom.c
index 24f09ef1..5f0eefdf 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -105,10 +105,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case CHKSW: 
 		case NOCHKSW: