X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=0cb2a5e0083186c5643560e6c6f872f6374c46de;hb=501f523802eeaed49dc095c9577a9e5f20447a6d;hp=1523a2c37fa678d3f62530f52cbbe855ddd13c15;hpb=9cf6132a6ea29968131a000bc2fb6860affac45e;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 1523a2c..0cb2a5e 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -162,17 +162,16 @@ main(int argc, char **argv)
 		adios(EX_OSERR, NULL, "atexit failed");
 	}
 
-/*
-** absolutely the first thing we do is save our privileges,
-** and drop them if we can.
-*/
+	/*
+	** absolutely the first thing we do is save our privileges,
+	** and drop them if we can.
+	*/
 	SAVEGROUPPRIVS();
 	TRYDROPGROUPPRIVS();
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
 
-	/* read user profile/context */
 	context_read();
 
 	arguments = getarguments(invo_name, argc, argv, 1);
@@ -311,7 +310,6 @@ main(int argc, char **argv)
 	if (chdir(maildir) == NOTOK)
 		adios(EX_OSERR, maildir, "unable to change directory to");
 
-	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
 		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
@@ -352,18 +350,33 @@ main(int argc, char **argv)
 			 dtimenow(), from);
 	}
 
-	/* Get new format string */
-	fmtstr = new_fs(form, FORMAT);
+	/* Set format string */
+	fmtstr = new_fs(form, scanformat);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
 		fflush(stdout);
 	}
 
+	/* check if readable and nonempty */
+	if (!fgets(buf, sizeof(buf), in)) {
+		if (ferror(in)) {
+			advise("read", "unable to");
+			incerr = SCNFAT;
+		} else {
+			incerr = SCNEOF;
+		}
+		goto giveup;
+	}
+	if (strncmp("From ", buf, 5)!=0) {
+		advise(NULL, "not in mbox format");
+		incerr = SCNFAT;
+		goto giveup;
+	}
+
 	/*
 	** Get the mail from file (usually mail spool)
 	*/
-	thisisanmbox(in);
 	hghnum = msgnum = mp->hghmsg;
 	for (;;) {
 		/*
@@ -431,6 +444,7 @@ main(int argc, char **argv)
 		*/
 		break;
 	}
+giveup:;
 	mh_free0(&maildir_copy);
 
 	if (incerr < 0) {  /* error */
@@ -494,9 +508,9 @@ main(int argc, char **argv)
 		fclose(in); in = NULL;
 	}
 
-	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
-	seq_save(mp);  /* synchronize sequences   */
-	context_save();  /* save the context file   */
+	seq_setunseen(mp, 1);
+	seq_save(mp);
+	context_save();
 	return 0;
 }