X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fforw.c;h=2d4f2d53deb22b2b2b75d0c9cea2eb35be81d3a1;hb=cd665517f488ca62e71b7fd1db6df0813dee052a;hp=93870b1af0c5c91e9cf1bc9738adb7536de5ccf4;hpb=b439ec143c4d2e2daf4b0a9c332123f24500cd9a;p=mmh

diff --git a/uip/forw.c b/uip/forw.c
index 93870b1..2d4f2d5 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -285,7 +285,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 {
 	    msgs[msgp++] = cp;
 	}
@@ -444,7 +444,8 @@ try_it_again:
 	done (0);
     what_now (ed, nedit, NOUSE, drft, NULL, 0, mp,
 	anot ? "Forwarded" : NULL, inplace, cwd);
-    return done (1);
+    done (1);
+    return 1;
 }
 
 
@@ -508,7 +509,7 @@ mhl_draft (int out, char *digest, int volume, int issue,
 
 	    if (mp->numsel >= MAXARGS - i)
 		adios (NULL, "more than %d messages for %s exec",
-			vec[0], MAXARGS - i);
+			MAXARGS - i, vec[0]);
 
 	    /*
 	     * Now add the message names to filter.  We can only