X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=159e0108d112d7bd3b1e0a1acb5fbcf51cb5af85;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=762a858d6ad59bf9c16e656996fa8f4e6846cac0;hpb=a0b824f146a18ad99633addede9e81a470d4cb59;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 762a858..159e010 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -41,31 +41,30 @@ static struct swit switches[] = {
 #define AUDSW  0
 	{ "audit audit-file", 0 },
 #define NAUDSW  1
-	{ "noaudit", 0 },
+	{ "noaudit", 2 },
 #define CHGSW  2
 	{ "changecur", 0 },
 #define NCHGSW  3
-	{ "nochangecur", 0 },
+	{ "nochangecur", 2 },
 #define FILESW  4
 	{ "file name", 0 },
 #define FORMSW  5
 	{ "form formatfile", 0 },
-#define FMTSW  6
-	{ "format string", 5 },
-#define SILSW  7
+#define SILSW  6
 	{ "silent", 0 },
-#define NSILSW  8
-	{ "nosilent", 0 },
-#define TRNCSW  9
+#define NSILSW  7
+	{ "nosilent", 2 },
+#define TRNCSW  8
 	{ "truncate", 0 },
-#define NTRNCSW  10
-	{ "notruncate", 0 },
-#define WIDTHSW  11
+#define NTRNCSW  9
+	{ "notruncate", 2 },
+#define WIDTHSW  10
 	{ "width columns", 0 },
-#define VERSIONSW  12
-	{ "version", 0 },
-#define HELPSW  13
+#define VERSIONSW  11
+	{ "Version", 0 },
+#define HELPSW  12
 	{ "help", 0 },
+	{ NULL, 0 },
 };
 
 /*
@@ -120,7 +119,7 @@ static FILE *in;
 /*
 ** prototypes
 */
-static void inc_done(int) NORETURN;
+static void inc_done();
 
 
 int
@@ -134,9 +133,9 @@ main(int argc, char **argv)
 			** not truncate mailspool
 			*/
 	char *cp, *maildir = NULL, *folder = NULL;
-	char *format = NULL, *form = NULL;
+	char *form = NULL;
 	char *audfile = NULL, *from = NULL;
-	char buf[BUFSIZ], **argp, *nfs, **arguments;
+	char buf[BUFSIZ], **argp, *fmtstr, **arguments;
 	struct msgs *mp = NULL;
 	struct stat st, s1;
 	FILE *aud = NULL;
@@ -144,11 +143,7 @@ main(int argc, char **argv)
 	/* copy of mail directory because the static gets overwritten */
 	char *maildir_copy = NULL;
 
-#ifdef MHE
-	FILE *mhe = NULL;
-#endif
-
-	done=inc_done;
+	atexit(inc_done);
 
 /*
 ** absolutely the first thing we do is save our privileges,
@@ -157,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 */
@@ -173,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 == '-')
@@ -240,13 +234,6 @@ main(int argc, char **argv)
 				if (!(form = *argp++) || *form == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				format = NULL;
-				continue;
-			case FMTSW:
-				if (!(format = *argp++) || *format == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				form = NULL;
 				continue;
 
 			case WIDTHSW:
@@ -303,16 +290,7 @@ main(int argc, char **argv)
 	if ((maildir_copy = strdup(maildir)) == NULL)
 		adios(maildir, "error allocating memory to copy maildir");
 
-	if (!folder_exists(maildir)) {
-		/*
-		** If the folder doesn't exist, and we're given the -silent
-		** flag, just fail.
-		*/
-		if (noisy)
-			create_folder(maildir, 0, done);
-		else
-			done(1);
-	}
+	create_folder(maildir, noisy ? 0 : 1, done);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -355,25 +333,11 @@ main(int argc, char **argv)
 			chmod(audfile, m_gmprot());
 
 		fprintf(aud, from ? "<<inc>> %s  -ms %s\n" : "<<inc>> %s\n",
-			 dtimenow(0), from);
-	}
-
-#ifdef MHE
-	if (context_find("mhe")) {
-		int i;
-		cp = concat(maildir, "/++", NULL);
-		i = stat(cp, &st);
-		if ((mhe = fopen(cp, "a")) == NULL)
-			admonish(cp, "unable to append to");
-		else
-			if (i == NOTOK)
-				chmod(cp, m_gmprot());
-		free(cp);
+			 dtimenow(), from);
 	}
-#endif /* MHE */
 
 	/* Get new format string */
-	nfs = new_fs(form, format, NULL, FORMAT);
+	fmtstr = new_fs(form, FORMAT);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
@@ -383,7 +347,7 @@ main(int argc, char **argv)
 	/*
 	** Get the mail from file (usually mail spool)
 	*/
-	m_unknown(in);  /* the MAGIC invocation... */
+	thisisanmbox(in);
 	hghnum = msgnum = mp->hghmsg;
 	for (;;) {
 		/*
@@ -397,8 +361,9 @@ main(int argc, char **argv)
 		}
 
 		/* create scanline for new message */
-		switch (incerr = scan(in, msgnum + 1, msgnum + 1, nfs, width,
-			msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+		switch (incerr = scan(in, msgnum + 1, msgnum + 1,
+				noisy ? fmtstr : NULL, width,
+				msgnum == hghnum && chgflag, 1)) {
 		case SCNFAT:
 		case SCNEOF:
 			break;
@@ -421,7 +386,6 @@ main(int argc, char **argv)
 			break;
 
 		case SCNMSG:
-		case SCNENC:
 			/*
 			**  Run the external program hook on the message.
 			*/
@@ -432,10 +396,6 @@ main(int argc, char **argv)
 
 			if (aud)
 				fputs(scanl, aud);
-#ifdef MHE
-			if (mhe)
-				fputs(scanl, mhe);
-#endif /* MHE */
 			if (noisy)
 				fflush(stdout);
 			msgnum++;
@@ -455,6 +415,7 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
+	free(maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {
@@ -473,11 +434,6 @@ main(int argc, char **argv)
 	if (aud)
 		fclose(aud);
 
-#ifdef MHE
-	if (mhe)
-		fclose(mhe);
-#endif /* MHE */
-
 	if (noisy)
 		fflush(stdout);
 
@@ -525,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);
 }