X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/08aa8c17c3241bb5c6a997ed2e01e25a4d0089ce..5c5dd3edc1081fa4bedec764e5e8cc44bc4fa5fd:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 0731a157..45036f5b 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 
 #ifdef POP
@@ -456,7 +457,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -562,10 +563,15 @@ main (int argc, char **argv)
     if ((maildir_copy = strdup(maildir)) == (char *)0)
         adios (maildir, "error allocating memory to copy maildir");
 
-    if (noisy)
-        create_folder(maildir, 0, done);
-    else
-        done (1);
+    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);
+    }
 
     if (chdir (maildir) == NOTOK)
 	adios (maildir, "unable to change directory to");