X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=a487adcfb9a511d377f87accd058f2ca4f80b989;hp=e94c259392cb0fbb8363cb41c5c6002b2460eb61;hb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c;hpb=a40e399a346d4aef26ad6ea583558cdf00751c1f

diff --git a/uip/pick.c b/uip/pick.c
index e94c259..a487adc 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,6 +9,9 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -76,7 +79,7 @@ static int pmatches(FILE *, int, long, long);
 
 static int listsw = -1;
 
-static void putzero_done(int) NORETURN;
+void putzero_done();
 
 int
 main(int argc, char **argv)
@@ -91,7 +94,9 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	register FILE *fp;
 
-	done=putzero_done;
+        if (atexit(putzero_done) != 0) {
+		adios(EX_OSERR, NULL, "atexit failed");
+	}
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -112,19 +117,19 @@ main(int argc, char **argv)
 			case AMBIGSW:
 				ambigsw(cp, switches);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case CCSW:
 			case DATESW:
@@ -138,12 +143,12 @@ main(int argc, char **argv)
 				vec[vecp++] = --cp;
 			pattern:
 				if (!(cp = *argp++)) /* allow -xyz arguments */
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				vec[vecp++] = cp;
 				continue;
 			case OTHRSW:
-				adios(NULL, "internal error!");
+				adios(EX_SOFTWARE, NULL, "internal error!");
 
 			case ANDSW:
 			case ORSW:
@@ -155,15 +160,15 @@ main(int argc, char **argv)
 
 			case SEQSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 
 				/* check if too many sequences specified */
 				if (seqp >= NUMATTRS)
-					adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
+					adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
 
 				if (!seq_nameok(cp))
-				  done(1);
+					exit(EX_USAGE);
 
 				seqs[seqp++] = cp;
 				continue;
@@ -190,7 +195,7 @@ main(int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios(NULL, "only one folder at a time!");
+				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
 				folder = getcpy(expandfol(cp));
 		} else
@@ -210,20 +215,20 @@ main(int argc, char **argv)
 	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+		adios(EX_OSERR, maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
-		adios(NULL, "unable to read folder %s", folder);
+		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */
 	if (mp->nummsg == 0)
-		adios(NULL, "no messages in %s", folder);
+		adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
 	/* 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(EX_USAGE);
 	seq_setprev(mp);  /* set the previous-sequence */
 
 	/*
@@ -234,11 +239,11 @@ main(int argc, char **argv)
 		listsw = !seqp;
 
 	if (publicsw == 1 && is_readonly(mp))
-		adios(NULL, "folder %s is read-only, so -public not allowed",
+		adios(EX_NOPERM, NULL, "folder %s is read-only, so -public not allowed",
 				folder);
 
 	if (!pcompile(vec, NULL))
-		done(1);
+		exit(EX_SOFTWARE);
 
 	lo = mp->lowsel;
 	hi = mp->hghsel;
@@ -280,7 +285,7 @@ main(int argc, char **argv)
 	mp->hghsel = hi;
 
 	if (mp->numsel <= 0)
-		adios(NULL, "no messages match specification");
+		adios(EX_DATAERR, NULL, "no messages match specification");
 
 	seqs[seqp] = NULL;
 
@@ -289,7 +294,7 @@ main(int argc, char **argv)
 	*/
 	for (seqp = 0; seqs[seqp]; seqp++)
 		if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw))
-			done(1);
+			exit(EX_USAGE);
 
 	/*
 	** Print total matched if not printing each matched message number.
@@ -302,17 +307,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)
+void
+putzero_done()
 {
-	if (listsw && status && !isatty(fileno(stdout)))
+	if (listsw && !isatty(fileno(stdout)))
 		printf("0\n");
-	exit(status);
 }
 
 
@@ -765,7 +769,7 @@ newnexus(int (*action)())
 	register struct nexus *p;
 
 	if ((p = (struct nexus *) calloc((size_t) 1, sizeof *p)) == NULL)
-		adios(NULL, "unable to allocate component storage");
+		adios(EX_OSERR, NULL, "unable to allocate component storage");
 
 	p->n_action = action;
 	return p;
@@ -1267,7 +1271,7 @@ plist
 			return 0;
 
 		default:
-			adios(NULL, "internal error -- you lose");
+			adios(EX_SOFTWARE, NULL, "internal error -- you lose");
 		}
 		break;
 	}