X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=ae1fa03fa83e5ce259b75aea425cc04489a35115;hb=96d10c193324201ef8acb622ed13e9a5ecb59827;hp=d8edbcaa9b8b1c7c007359f998b735a9073ffa60;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;p=mmh

diff --git a/uip/pick.c b/uip/pick.c
index d8edbca..ae1fa03 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -45,21 +45,21 @@ static struct swit switches[] = {
 #define BEFRSW  13
 	{ "before date", 0 },
 #define DATFDSW  14
-	{ "datefield field", 5 },
+	{ "datefield field", 5 },  /* 5 chars required to differ from -date */
 #define SEQSW  15
 	{ "sequence name", 0 },
 #define PUBLSW  16
 	{ "public", 0 },
 #define NPUBLSW  17
-	{ "nopublic", 0 },
+	{ "nopublic", 2 },
 #define ZEROSW  18
 	{ "zero", 0 },
 #define NZEROSW  19
-	{ "nozero", 0 },
+	{ "nozero", 2 },
 #define LISTSW  20
 	{ "list", 0 },
 #define NLISTSW  21
-	{ "nolist", 0 },
+	{ "nolist", 2 },
 #define VERSIONSW  22
 	{ "Version", 0 },
 #define HELPSW  23
@@ -76,7 +76,7 @@ static int pmatches(FILE *, int, long, long);
 
 static int listsw = -1;
 
-static void putzero_done(int) NORETURN;
+static void putzero_done();
 
 int
 main(int argc, char **argv)
@@ -91,11 +91,9 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	register FILE *fp;
 
-	done=putzero_done;
+	atexit(putzero_done);
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -114,7 +112,7 @@ main(int argc, char **argv)
 			case AMBIGSW:
 				ambigsw(cp, switches);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
@@ -122,11 +120,11 @@ main(int argc, char **argv)
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(0);
 
 			case CCSW:
 			case DATESW:
@@ -165,7 +163,7 @@ main(int argc, char **argv)
 					adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
 
 				if (!seq_nameok(cp))
-				  done(1);
+				  exit(1);
 
 				seqs[seqp++] = cp;
 				continue;
@@ -225,7 +223,7 @@ main(int argc, char **argv)
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
-			done(1);
+			exit(1);
 	seq_setprev(mp);  /* set the previous-sequence */
 
 	/*
@@ -240,7 +238,7 @@ main(int argc, char **argv)
 				folder);
 
 	if (!pcompile(vec, NULL))
-		done(1);
+		exit(1);
 
 	lo = mp->lowsel;
 	hi = mp->hghsel;
@@ -291,7 +289,7 @@ main(int argc, char **argv)
 	*/
 	for (seqp = 0; seqs[seqp]; seqp++)
 		if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw))
-			done(1);
+			exit(1);
 
 	/*
 	** Print total matched if not printing each matched message number.
@@ -304,17 +302,16 @@ main(int argc, char **argv)
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */
-	done(0);
-	return 1;
+	listsw = 0; /* HACK */
+	return 0;
 }
 
 
 static void
-putzero_done(int status)
+putzero_done()
 {
-	if (listsw && status && !isatty(fileno(stdout)))
+	if (listsw && !isatty(fileno(stdout)))
 		printf("0\n");
-	exit(status);
 }