X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c5d1bc36f816a0ea5a100db491ec4308e804dc5..aee19c1b38bbbaeb4a0354590900b72d25e7b2d8:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index b63c53c8..dafdbdb8 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -496,6 +496,8 @@ process_messages(struct format *fmt, struct msgs_array *comps,
     struct msgs *mp;
     struct comp *c;
     FILE *in;
+    m_getfld_state_t gstate = 0;
+    int bufsz;
 
     if (! folder)
     	folder = getfolder(1);
@@ -585,29 +587,33 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 	     */
 
 	    for (state = FLD;;) {
-	    	state = m_getfld(state, name, rbuf, sizeof(rbuf), in);
+	    	bufsz = sizeof(rbuf);
+	    	state = m_getfld(&gstate, name, rbuf, &bufsz, in);
 		switch (state) {
 		case FLD:
 		case FLDPLUS:
 		    i = fmt_addcomptext(name, rbuf);
 		    if (i != -1) {
 		    	while (state == FLDPLUS) {
-			    state = m_getfld(state, name, rbuf,
-			    		     sizeof(rbuf), in);
+			    bufsz = sizeof(rbuf);
+			    state = m_getfld(&gstate, name, rbuf, &bufsz, in);
 			    fmt_appendcomp(i, name, rbuf);
 			}
 		    }
 
-		    while (state == FLDPLUS)
-		    	state = m_getfld(state, name, rbuf,
-					 sizeof(rbuf), in);
+		    while (state == FLDPLUS) {
+		    	bufsz = sizeof(rbuf);
+		    	state = m_getfld(&gstate, name, rbuf, &bufsz, in);
+		    }
 		    break;
 
 		case BODY:
 		    if (fmt_findcomp("body")) {
-			if ((i = strlen(rbuf)) < outwidth)
-			    state = m_getfld(state, name, rbuf + i,
-			    		     outwidth - 1, in);
+			if ((i = strlen(rbuf)) < outwidth) {
+			    bufsz = outwidth - 1;
+			    state = m_getfld(&gstate, name, rbuf + i,
+			    		     &bufsz, in);
+			}
 
 			fmt_addcomptext("body", rbuf);
 		    }
@@ -619,6 +625,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 	    }
 finished:
 	    fclose(in);
+	    m_getfld_state_destroy(&gstate);
 
 	    /*
 	     * Do this now to override any components in the original message
@@ -988,8 +995,8 @@ f_typestr(int t)
 	case FT_LS_COMP: return("LS_COMP");
 	case FT_LS_LIT: return("LS_LIT");
 	case FT_LS_GETENV: return("LS_GETENV");
-	case FT_LS_DECODECOMP: return("FT_LS_DECODECOMP");
-	case FT_LS_DECODE: return("FT_LS_DECODE");
+	case FT_LS_DECODECOMP: return("LS_DECODECOMP");
+	case FT_LS_DECODE: return("LS_DECODE");
 	case FT_LS_TRIM: return("LS_TRIM");
 	case FT_LV_COMP: return("LV_COMP");
 	case FT_LV_COMPFLAG: return("LV_COMPFLAG");
@@ -1033,6 +1040,7 @@ f_typestr(int t)
 	case FT_LS_FRIENDLY: return("LS_FRIENDLY");
 	case FT_LV_HOSTTYPE: return("LV_HOSTTYPE");
 	case FT_LV_INGRPF: return("LV_INGRPF");
+	case FT_LS_UNQUOTE: return("LS_UNQUOTE");
 	case FT_LV_NOHOSTF: return("LV_NOHOSTF");
 	case FT_LOCALDATE: return("LOCALDATE");
 	case FT_GMTDATE: return("GMTDATE");
@@ -1066,7 +1074,7 @@ f_typestr(int t)
 	case FT_V_MATCH: return("V_MATCH");
 	case FT_V_AMATCH: return("V_AMATCH");
 	default:
-		printf(buf, "/* ??? #%d */", t);
+		snprintf(buf, sizeof(buf), "/* ??? #%d */", t);
 		return(buf);
 	}
 }