X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=213cc5dd61de2b55fab71863c1b639c0bcc2debe;hb=8ab7ca4f2b4caa1f1ed2859d7d911513a7b2b2a2;hp=4b75c6e29578e7717a98b5a00d9bb249e48f05e5;hpb=5f2b39344cca1086c975d47b730929d8f1904214;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 4b75c6e..213cc5d 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -119,7 +119,7 @@ static FILE *in;
 /*
 ** prototypes
 */
-static void inc_done(int) NORETURN;
+static void inc_done();
 
 
 int
@@ -143,7 +143,7 @@ main(int argc, char **argv)
 	/* copy of mail directory because the static gets overwritten */
 	char *maildir_copy = NULL;
 
-	done=inc_done;
+	atexit(inc_done);
 
 /*
 ** absolutely the first thing we do is save our privileges,
@@ -152,9 +152,7 @@ main(int argc, char **argv)
 	SAVEGROUPPRIVS();
 	TRYDROPGROUPPRIVS();
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -168,17 +166,18 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				/* sysexits.h EX_USAGE */
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case AUDSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -291,7 +290,7 @@ main(int argc, char **argv)
 	if ((maildir_copy = strdup(maildir)) == NULL)
 		adios(maildir, "error allocating memory to copy maildir");
 
-	create_folder(maildir, noisy ? 0 : 1, done);
+	create_folder(maildir, noisy ? 0 : 1, exit);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -482,17 +481,15 @@ main(int argc, char **argv)
 	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
 	seq_save(mp);  /* synchronize sequences   */
 	context_save();  /* save the context file   */
-	done(0);
-	return 1;
+	return 0;
 }
 
 static void
-inc_done(int status)
+inc_done()
 {
 	if (locked) {
 		GETGROUPPRIVS();
 		lkfclose(in, newmail);
 		DROPGROUPPRIVS();
 	}
-	exit(status);
 }