Merge branch 'm_getfld2-meillo' into master

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 36e0ab1..0cb2a5e 100644 (file)
--- 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);
 
@@ -360,10 +358,25 @@ main(int argc, char **argv)
                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;
 }