X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fforw.c;h=17e78e981782ae09a824ae3e6e6387fa3c6ad24f;hb=30fd2ad6d3eff3749b2ae99ec90d2215bf1b1aca;hp=319cc3980be6d24e9b43558884b3902aaeec46c6;hpb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2;p=mmh

diff --git a/uip/forw.c b/uip/forw.c
index 319cc39..17e78e9 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;
 	}
@@ -393,16 +393,8 @@ try_it_again:
 	if (!form)
 	    form = digestcomps;
 	in = build_form (form, digest, volume, issue);
-    } else {
-	if (form) {
-	    if ((in = open (etcpath (form), O_RDONLY)) == NOTOK)
-		adios (form, "unable to open form file");
-	} else {
-	    if ((in = open (etcpath (forwcomps), O_RDONLY)) == NOTOK)
-		adios (forwcomps, "unable to open default components file");
-	    form = forwcomps;
-	}
-    }
+    } else
+	in = open_form(&form, forwcomps);
 
     if ((out = creat (drft, m_gmprot ())) == NOTOK)
 	adios (drft, "unable to create");
@@ -516,7 +508,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