X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=f737d698bf48ec8eb5484ef63a52ef81203fc372;hp=6546ceac59b059fdf39d1f674334fef717789b6f;hb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;hpb=6b80b3bb772e2cf9186cf964bf78109b677e1bef

diff --git a/uip/inc.c b/uip/inc.c
index 6546cea..f737d69 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -41,11 +41,11 @@ 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
@@ -53,17 +53,18 @@ static struct swit switches[] = {
 #define SILSW  6
 	{ "silent", 0 },
 #define NSILSW  7
-	{ "nosilent", 0 },
+	{ "nosilent", 2 },
 #define TRNCSW  8
 	{ "truncate", 0 },
 #define NTRNCSW  9
-	{ "notruncate", 0 },
+	{ "notruncate", 2 },
 #define WIDTHSW  10
 	{ "width columns", 0 },
 #define VERSIONSW  11
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  12
 	{ "help", 0 },
+	{ NULL, 0 },
 };
 
 /*
@@ -134,7 +135,7 @@ main(int argc, char **argv)
 	char *cp, *maildir = NULL, *folder = 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;
@@ -142,10 +143,6 @@ 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;
 
 /*
@@ -155,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 */
@@ -294,16 +289,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");
@@ -346,25 +332,11 @@ main(int argc, char **argv)
 			chmod(audfile, m_gmprot());
 
 		fprintf(aud, from ? "<<inc>> %s  -ms %s\n" : "<<inc>> %s\n",
-			 dtimenow(0), from);
+			 dtimenow(), 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);
-	}
-#endif /* MHE */
-
 	/* Get new format string */
-	nfs = new_fs(form, FORMAT);
+	fmtstr = new_fs(form, FORMAT);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
@@ -374,7 +346,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 (;;) {
 		/*
@@ -389,7 +361,7 @@ main(int argc, char **argv)
 
 		/* create scanline for new message */
 		switch (incerr = scan(in, msgnum + 1, msgnum + 1,
-				noisy ? nfs : NULL, width,
+				noisy ? fmtstr : NULL, width,
 				msgnum == hghnum && chgflag, 1)) {
 		case SCNFAT:
 		case SCNEOF:
@@ -423,10 +395,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++;
@@ -446,6 +414,7 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
+	free(maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {
@@ -464,11 +433,6 @@ main(int argc, char **argv)
 	if (aud)
 		fclose(aud);
 
-#ifdef MHE
-	if (mhe)
-		fclose(mhe);
-#endif /* MHE */
-
 	if (noisy)
 		fflush(stdout);