X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=2fbb9b654e1e791c5f359ad768bf49846a5d3697;hb=d0581ba306a7299113a346f9b4c46ce97bc4cef6;hp=04572c0ba31125116ace0def8a31b6faff762bdf;hpb=064527f7b57ab050e5af13e15ad99aeeab125857;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 04572c0..2fbb9b6 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -64,6 +64,7 @@ static struct swit switches[] = {
 	{ "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;
@@ -294,16 +295,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,7 +338,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
@@ -364,7 +356,7 @@ main(int argc, char **argv)
 #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 +366,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 (;;) {
 		/*
@@ -388,8 +380,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;
@@ -445,6 +438,7 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
+	free(maildir_copy);
 
 	if (incerr < 0) {  /* error */
 		if (locked) {