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

diff --git a/uip/inc.c b/uip/inc.c
index 6546cea..98fffef 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -134,7 +134,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 +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");
@@ -364,7 +355,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 +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 (;;) {
 		/*
@@ -389,7 +380,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: