Replaced folder_exists() by a call to create_folder().

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index b48c9ea..be6be22 100644 (file)
--- 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);
@@ -388,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;
@@ -412,7 +404,6 @@ main(int argc, char **argv)
                        break;
 
                case SCNMSG:
-               case SCNENC:
                        /*
                        **  Run the external program hook on the message.
                        */