X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fcomp.c;h=65b213aef9b84f7b36bba619d313bbb435f5b2ca;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=29ca1b77d0dad824ad6cad078031dc66b3281362;hpb=cff8de7654cf393a494b01a587bd4d503d15a5e3;p=mmh

diff --git a/uip/comp.c b/uip/comp.c
index 29ca1b7..65b213a 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -294,34 +294,34 @@ main (int argc, char **argv)
 
         cp = new_fs(form, NULL, NULL);
 	format_len = strlen(cp);
-	fmt_compile(cp, &fmt);
+	fmt_compile(cp, &fmt, 1);
 
 	/*
 	 * Set up any components that were fed to us on the command line
 	 */
 
 	if (from) {
-	    FINDCOMP(cptr, "from");
+	    cptr = fmt_findcomp("from");
 	    if (cptr)
 	    	cptr->c_text = from;
 	}
 	if (to) {
-	    FINDCOMP(cptr, "to");
+	    cptr = fmt_findcomp("to");
 	    if (cptr)
 	    	cptr->c_text = to;
 	}
 	if (cc) {
-	    FINDCOMP(cptr, "cc");
+	    cptr = fmt_findcomp("cc");
 	    if (cptr)
 	    	cptr->c_text = cc;
 	}
 	if (fcc) {
-	    FINDCOMP(cptr, "fcc");
+	    cptr = fmt_findcomp("fcc");
 	    if (cptr)
 	    	cptr->c_text = fcc;
 	}
 	if (subject) {
-	    FINDCOMP(cptr, "subject");
+	    cptr = fmt_findcomp("subject");
 	    if (cptr)
 	    	cptr->c_text = subject;
 	}
@@ -392,7 +392,7 @@ try_it_again:
 	dat[2] = 0;
 	dat[3] = outputlinelen;
 	dat[4] = 0;
-	fmt_scan(fmt, scanl, i, dat);
+	fmt_scan(fmt, scanl, i + 1, i, dat);
 	write(out, scanl, strlen(scanl));
 	free(scanl);
     } else {