X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=45036f5baa0877b399fdcbdda930f76939e0ddc4;hb=7edb0cbc236244d996d1e2ae1d58d0e9f7d98062;hp=aee194aa39c6ab3539e8d3afe60494ddf2bdb696;hpb=8c1b8e55ba6269af3f6be282eeb7b5a19516315f;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index aee194a..45036f5 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -457,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);
 	}
@@ -563,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");