X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=2d4f2d53deb22b2b2b75d0c9cea2eb35be81d3a1;hp=8455431a2a7db2d072a5d78c63e0be1b1012061e;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=197f95940cc0860683e6988352f721e6603f9339

diff --git a/uip/forw.c b/uip/forw.c
index 8455431..2d4f2d5 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -3,12 +3,17 @@
  * forw.c -- forward a message, or group of messages.
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/fmt_scan.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
+#include <h/utils.h>
 
 
 #define	IFORMAT	"digest-issue-%s"
@@ -62,13 +67,13 @@ static struct swit switches[] = {
 #define VERSIONSW             22
     { "version", 0 },
 #define	HELPSW                23
-    { "help", 4 },
+    { "help", 0 },
 #define	FILESW                24
-    { "file file", -4 },		/* interface from msh */
+    { "file file", 4 },			/* interface from msh */
 
 #ifdef MHE
 #define	BILDSW                25
-    { "build", -5 },			/* interface from mhe */
+    { "build", 5 },			/* interface from mhe */
 #endif /* MHE */
 
     { NULL, 0 }
@@ -280,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;
 	}
@@ -388,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");
@@ -447,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;
 }
 
 
@@ -511,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
@@ -684,8 +682,7 @@ build_form (char *form, char *digest, int volume, int issue)
     if ((in = dup (fileno (tmp))) == NOTOK)
 	adios ("dup", "unable to");
 
-    if ((line = malloc ((unsigned) fmtsize)) == NULL)
-	adios (NULL, "unable to allocate format line storage");
+    line = mh_xmalloc ((unsigned) fmtsize);
     fmt_scan (fmt, line, fmtsize, dat);
     fputs (line, tmp);
     free (line);