X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e9bab734900d62af2bf2fc873dd480e7503335b9..6015bb1f7:/uip/forw.c?ds=inline

diff --git a/uip/forw.c b/uip/forw.c
index ef536a56..5e7db30b 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 
 #define	IFORMAT	"digest-issue-%s"
@@ -39,7 +40,7 @@
     X("nodashstuffing", 0, NBITSTUFFSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
-    X("file file", 4, FILESW)                 /* interface from msh */ \
+    X("file file", 4, FILESW) \
     X("build", 5, BILDSW)                     /* interface from mhe */ \
     X("from address", 0, FROMSW) \
     X("to address", 0, TOSW) \
@@ -110,7 +111,7 @@ main (int argc, char **argv)
     char *dmsg = NULL, *digest = NULL, *ed = NULL;
     char *file = NULL, *filter = NULL, *folder = NULL, *fwdmsg = NULL;
     char *from = NULL, *to = NULL, *cc = NULL, *subject = NULL, *fcc = NULL;
-    char *form = NULL, buf[BUFSIZ], value[10];
+    char *form = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     struct stat st;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -289,8 +290,7 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    app_msgarg(&msgs, cp);
 	}
@@ -453,11 +453,9 @@ try_it_again:
 
 	if (digest) {
 	    snprintf (buf, sizeof(buf), IFORMAT, digest);
-	    snprintf (value, sizeof(value), "%d", issue);
-	    context_replace (buf, mh_xstrdup(value));
+	    context_replace (buf, mh_xstrdup(m_str(issue)));
 	    snprintf (buf, sizeof(buf), VFORMAT, digest);
-	    snprintf (value, sizeof(value), "%d", volume);
-	    context_replace (buf, mh_xstrdup(value));
+	    context_replace (buf, mh_xstrdup(m_str(volume)));
 	}
 
 	context_replace (pfolder, folder);	/* update current folder   */