X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=5142ae3ab5e2092bc2d8e785ef3ea1f23129ebcb;hb=07ac3f117098490f03b7f61e0257dc2d07583402;hp=587bd846df21b930424bd3d934a86545a46222c2;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 587bd84..5142ae3 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -50,21 +50,19 @@ static struct swit switches[] = {
 	{ "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
+#define NSILSW  7
 	{ "nosilent", 0 },
-#define TRNCSW  9
+#define TRNCSW  8
 	{ "truncate", 0 },
-#define NTRNCSW  10
+#define NTRNCSW  9
 	{ "notruncate", 0 },
-#define WIDTHSW  11
+#define WIDTHSW  10
 	{ "width columns", 0 },
-#define VERSIONSW  12
+#define VERSIONSW  11
 	{ "version", 0 },
-#define HELPSW  13
+#define HELPSW  12
 	{ "help", 0 },
 };
 
@@ -134,9 +132,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;
@@ -240,13 +238,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 +294,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,7 +337,7 @@ 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
@@ -373,7 +355,7 @@ main(int argc, char **argv)
 #endif /* MHE */
 
 	/* Get new format string */
-	nfs = new_fs(form, format, FORMAT);
+	fmtstr = new_fs(form, FORMAT);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
@@ -383,7 +365,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 +379,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 +404,6 @@ main(int argc, char **argv)
 			break;
 
 		case SCNMSG:
-		case SCNENC:
 			/*
 			**  Run the external program hook on the message.
 			*/
@@ -455,6 +437,7 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
+	free(maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {