X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlist.c;h=8c7e51d2cc0075af7c63d5fa659b8cc346b104ec;hp=99b2cc787c8a9f0becc47cc021e044583b42675b;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=d1fefd9f614e4dc3cda16da6c69133c1b2005269

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 99b2cc7..8c7e51d 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -17,29 +17,21 @@
 #include <h/utils.h>
 
 static struct swit switches[] = {
-#define HEADSW  0
-	{ "headers", 0 },
-#define NHEADSW  1
-	{ "noheaders", 0 },
-#define SIZESW  2
-	{ "realsize", 0 },
-#define NSIZESW  3
-	{ "norealsize", 0 },
-#define VERBSW  4
+#define VERBSW  0
 	{ "verbose", 0 },
-#define NVERBSW  5
-	{ "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define NVERBSW  1
+	{ "noverbose", 2 },
+#define FILESW  2  /* interface from show */
 	{ "file file", 0 },
-#define PARTSW  7
+#define PARTSW  3
 	{ "part number", 0 },
-#define TYPESW  8
+#define TYPESW  4
 	{ "type content", 0 },
-#define VERSIONSW  9
-	{ "version", 0 },
-#define HELPSW  10
+#define VERSIONSW  5
+	{ "Version", 0 },
+#define HELPSW  6
 	{ "help", 0 },
-#define DEBUGSW  11
+#define DEBUGSW  7
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -76,12 +68,12 @@ void set_endian(void);
 void flush_errors(void);
 
 /* mhlistsbr.c */
-void list_all_messages(CT *, int, int, int, int);
+void list_all_messages(CT *, int, int);
 
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -92,7 +84,6 @@ static void pipeser(int);
 int
 main(int argc, char **argv)
 {
-	int sizesw = 1, headsw = 1;
 	int msgnum;
 	char *cp, *file = NULL, *folder = NULL;
 	char *maildir, buf[100], **argp;
@@ -101,11 +92,9 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	CT ct, *ctp;
 
-	done=freects_done;
+	atexit(freects_done);
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -122,31 +111,17 @@ 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);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
-
-			case HEADSW:
-				headsw = 1;
-				continue;
-			case NHEADSW:
-				headsw = 0;
-				continue;
-
-			case SIZESW:
-				sizesw = 1;
-				continue;
-			case NSIZESW:
-				sizesw = 0;
-				continue;
+				exit(0);
 
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -244,9 +219,12 @@ main(int argc, char **argv)
 			adios(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);
+		for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+			if (!m_convert(mp, msgs.msgs[msgnum])) {
+				/* sysexits.h EX_USAGE */
+				exit(1);
+			}
+		}
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
@@ -266,7 +244,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -290,7 +268,7 @@ main(int argc, char **argv)
 	/*
 	** List the message content
 	*/
-	list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+	list_all_messages(cts, verbosw, debugsw);
 
 	/* Now free all the structures for the content */
 	for (ctp = cts; *ctp; ctp++)
@@ -307,8 +285,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -322,6 +299,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }