X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=8992b33cc97136dfaa33743ec2c755d494bca98c;hp=38ede22eb3858a9731e9f173630818eba603b4c5;hb=8edf2fa76c7b6d224d3f1b8cc7a764e624c45816;hpb=003cacd23c8f80054990c5ad3303f9a115241583

diff --git a/uip/forw.c b/uip/forw.c
index 38ede22..8992b33 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -73,7 +73,7 @@ main(int argc, char **argv)
 	char *folder = NULL;
 	char *form = NULL, buf[BUFSIZ], value[10];
 	char **argp, **arguments, *msgs[MAXARGS];
-	char *nfs;
+	char *fmtstr;
 
 #ifdef MHE
 	int buildsw = 0;
@@ -237,8 +237,8 @@ main(int argc, char **argv)
 		cpydata(in, out, form, drft);
 		close(in);
 	} else {
-		nfs = new_fs(form, NULL, forwcomps, NULL);
-		if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+		fmtstr = new_fs(form, forwcomps);
+		if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
 			adios(drft, "error writing");
 		}
 	}
@@ -288,7 +288,7 @@ add_forw_hdr(char *draft)
 		strncat(buffer, m_name(msgnum),
 				sizeof(buffer)-strlen(buffer)-1);
 	}
-	annotate(draft, attach_hdr, buffer, 0, -2, 1);
+	annotate(draft, attach_hdr, buffer, 0, -2, 1, 0);
 }
 
 
@@ -297,7 +297,7 @@ build_form(char *form, char *digest, int volume, int issue)
 {
 	int in;
 	int fmtsize;
-	register char *nfs;
+	register char *fmtstr;
 	char *line, tmpfil[BUFSIZ];
 	FILE *tmp;
 	register struct comp *cptr;
@@ -306,11 +306,11 @@ build_form(char *form, char *digest, int volume, int issue)
 	char *cp = NULL;
 
 	/* Get new format string */
-	nfs = new_fs(form, NULL, NULL, NULL);
-	fmtsize = strlen(nfs) + 256;
+	fmtstr = new_fs(form, NULL);
+	fmtsize = strlen(fmtstr) + 256;
 
 	/* Compile format string */
-	fmt_compile(nfs, &fmt);
+	fmt_compile(fmtstr, &fmt);
 
 	FINDCOMP(cptr, "digest");
 	if (cptr)