X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/11e2fb2dbbc074cce78d62fdf425e6bbf1918949..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/fmttest.c?ds=sidebyside

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 387003f3..7d08438b 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -29,7 +29,6 @@
     X("ccme", 0, CCMESW) \
     X("noccme", 0, NCCMESW) \
     X("outsize size-in-characters", 0, OUTSIZESW) \
-    X("bufsize size-in-bytes", 0, BUFSZSW) \
     X("width column-width", 0, WIDTHSW) \
     X("msgnum number", 0, MSGNUMSW) \
     X("msgcur flag", 0, MSGCURSW) \
@@ -85,15 +84,16 @@ static char *c_typestr(int);
 static char *c_flagsstr(int);
 static void litputs(const char *);
 static void litputc(char);
-static void process_addresses(struct format *, struct msgs_array *, char *,
-			      int, int, int *, struct fmt_callbacks *);
-static void process_raw(struct format *, struct msgs_array *, char *,
-			int, int, int *, struct fmt_callbacks *);
+static void process_addresses(struct format *, struct msgs_array *,
+			      charstring_t, int, int *,
+			      struct fmt_callbacks *);
+static void process_raw(struct format *, struct msgs_array *, charstring_t,
+			int, int *, struct fmt_callbacks *);
 static void process_messages(struct format *, struct msgs_array *,
-			     struct msgs_array *, char *, char *, int,
-			     int, int, int *, struct fmt_callbacks *);
+			     struct msgs_array *, charstring_t, char *, int,
+			     int, int *, struct fmt_callbacks *);
 static void process_single_file(FILE *, struct msgs_array *, int *, int,
-				struct format *, char *, int, int,
+				struct format *, charstring_t, int,
 				struct fmt_callbacks *);
 static void test_trace(void *, struct format *, int, char *, const char *);
 static char *test_formataddr(char *, char *);
@@ -110,12 +110,13 @@ int
 main (int argc, char **argv)
 {
     char *cp, *form = NULL, *format = NULL, *defformat = FORMAT, *folder = NULL;
-    char buf[BUFSIZ], *nfs, **argp, **arguments, *buffer;
+    char buf[BUFSIZ], *nfs, **argp, **arguments;
+    charstring_t buffer;
     struct format *fmt;
     struct comp *cptr;
     struct msgs_array msgs = { 0, 0, NULL }, compargs = { 0, 0, NULL};
     int dump = 0, i;
-    int outputsize = 0, bufsize = 0, dupaddrs = 1, trace = 0, files = 0;
+    int outputsize = 0, dupaddrs = 1, trace = 0, files = 0;
     int colwidth = -1, msgnum = -1, msgcur = -1, msgsize = -1, msgunseen = -1;
     enum mode_t mode = MESSAGE;
     int dat[5];
@@ -164,17 +165,12 @@ main (int argc, char **argv)
 		    if (!(cp = *argp++) || *cp == '-')
 		    	adios(NULL, "missing argument to %s", argp[-2]);
 		    if (strcmp(cp, "max") == 0)
-		    	outputsize = -1;
+			outputsize = INT_MAX;
 		    else if (strcmp(cp, "width") == 0)
 		    	outputsize = sc_width();
 		    else
 			outputsize = atoi(cp);
 		    continue;
-		case BUFSZSW:
-		    if (!(cp = *argp++) || *cp == '-')
-		    	adios(NULL, "missing argument to %s", argp[-2]);
-		    bufsize = atoi(cp);
-		    continue;
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
@@ -321,22 +317,13 @@ main (int argc, char **argv)
 	}
     }
 
-    /*
-     * If we don't specify a buffer size, allocate a default one.
-     */
-
-    if (bufsize == 0)
-    	bufsize = BUFSIZ;
-
-    buffer = mh_xmalloc(bufsize);
+    buffer = charstring_create(BUFSIZ);
 
-    if (outputsize < 0)
-	outputsize = bufsize - 1;	/* For the trailing NUL */
-    else if (outputsize == 0) {
+    if (outputsize == 0) {
 	if (mode == MESSAGE)
 	    outputsize = sc_width();
 	else
-	    outputsize = bufsize - 1;
+	    outputsize = INT_MAX;
     }
 
     dat[0] = msgnum;
@@ -364,10 +351,10 @@ main (int argc, char **argv)
 	if (trace) {
 	    struct trace_context *ctx;
 
-	    ctx = mh_xmalloc(sizeof(*ctx));
+	    NEW(ctx);
 	    ctx->num = -1;
 	    ctx->str = dummy;
-	    ctx->outbuf = getcpy(NULL);
+	    ctx->outbuf = mh_xstrdup("");
 
 	    cb.trace_func = test_trace;
 	    cb.trace_context = ctx;
@@ -375,8 +362,8 @@ main (int argc, char **argv)
     }
 
     if (mode == MESSAGE) {
-    	process_messages(fmt, &compargs, &msgs, buffer, folder, bufsize,
-			 outputsize, files, dat, cbp);
+	process_messages(fmt, &compargs, &msgs, buffer, folder, outputsize,
+			 files, dat, cbp);
     } else {
 	if (compargs.size) {
 	    for (i = 0; i < compargs.size; i += 2) {
@@ -387,12 +374,12 @@ main (int argc, char **argv)
 	}
 
 	if (mode == ADDRESS) {
-	    process_addresses(fmt, &msgs, buffer, bufsize, outputsize,
-	    		      dat, cbp);
+	    process_addresses(fmt, &msgs, buffer, outputsize, dat, cbp);
 	} else /* Fall-through for RAW or DATE */
-	    process_raw(fmt, &msgs, buffer, bufsize, outputsize, dat, cbp);
+	    process_raw(fmt, &msgs, buffer, outputsize, dat, cbp);
     }
 
+    charstring_free(buffer);
     fmt_free(fmt, 1);
 
     done(0);
@@ -410,8 +397,9 @@ struct pqpair {
 };
 
 static void
-process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
-		  int bufsize, int outwidth, int *dat, struct fmt_callbacks *cb)
+process_addresses(struct format *fmt, struct msgs_array *addrs,
+		  charstring_t buffer, int outwidth, int *dat,
+		  struct fmt_callbacks *cb)
 {
     int i;
     char *cp, error[BUFSIZ];
@@ -432,11 +420,10 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
     for (i = 0; i < addrs->size; i++) {
     	(q = &pq)->pq_next = NULL;
 	while ((cp = getname(addrs->msgs[i]))) {
-	    if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
-	    	adios (NULL, "unable to allocate pqpair memory");
+	    NEW0(p);
 	    if ((mp = getm(cp, NULL, 0, error, sizeof(error))) == NULL) {
-	    	p->pq_text = getcpy(cp);
-		p->pq_error = getcpy(error);
+	    	p->pq_text = mh_xstrdup(cp);
+		p->pq_error = mh_xstrdup(error);
 	    } else {
 	    	p->pq_text = getcpy(mp->m_text);
 		mnfree(mp);
@@ -447,27 +434,23 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
 	for (p = pq.pq_next; p; p = q) {
 	    c = fmt_findcomp("text");
 	    if (c) {
-	    	if (c->c_text)
-		    free(c->c_text);
+                mh_xfree(c->c_text);
 		c->c_text = p->pq_text;
 		p->pq_text = NULL;
 	    }
 	    c = fmt_findcomp("error");
 	    if (c) {
-	    	if (c->c_text)
-		    free(c->c_text);
+                mh_xfree(c->c_text);
 		c->c_text = p->pq_error;
 		p->pq_error = NULL;
 	    }
 
-	    fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
-	    fputs(buffer, stdout);
+	    fmt_scan(fmt, buffer, outwidth, dat, cb);
+	    fputs(charstring_buffer(buffer), stdout);
 	    mlistfree();
 
-	    if (p->pq_text)
-	    	free(p->pq_text);
-	    if (p->pq_error)
-	    	free(p->pq_error);
+            mh_xfree(p->pq_text);
+            mh_xfree(p->pq_error);
 	    q = p->pq_next;
 	    free(p);
 	}
@@ -481,8 +464,8 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
 
 static void
 process_messages(struct format *fmt, struct msgs_array *comps,
-		 struct msgs_array *msgs, char *buffer, char *folder,
-		 int bufsize, int outwidth, int files, int *dat,
+		 struct msgs_array *msgs, charstring_t buffer, char *folder,
+		 int outwidth, int files, int *dat,
 		 struct fmt_callbacks *cb)
 {
     int i, msgnum, msgsize = dat[2], num = dat[0], cur = dat[1];
@@ -504,7 +487,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 		continue;
 	    }
 	    process_single_file(in, comps, dat, msgsize, fmt, buffer,
-	    			bufsize, outwidth, cb);
+				outwidth, cb);
 	}
 
 	return;
@@ -542,14 +525,13 @@ process_messages(struct format *fmt, struct msgs_array *comps,
     	if ((cp = context_find(usequence)) && *cp) {
 	    char **ap, *dp;
 
-	    dp = getcpy(cp);
+	    dp = mh_xstrdup(cp);
 	    ap = brkstring(dp, " ", "\n");
 	    for (i = 0; ap && *ap; i++, ap++)
 		ivector_push_back (seqnum, seq_getnum(mp, *ap));
 		
 	    num_unseen_seq = i;
-	    if (dp)
-	    	free(dp);
+            mh_xfree(dp);
 	}
     }
 
@@ -585,7 +567,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 	     */
 
 	    process_single_file(in, comps, dat, msgsize, fmt, buffer,
-	    			bufsize, outwidth, cb);
+				outwidth, cb);
 	}
     }
 
@@ -600,11 +582,11 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 
 static void
 process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
-		    struct format *fmt, char *buffer, int bufsize,
-		    int outwidth, struct fmt_callbacks *cb)
+		    struct format *fmt, charstring_t buffer, int outwidth,
+		    struct fmt_callbacks *cb)
 {
     int i, state;
-    char name[NAMESZ], rbuf[BUFSIZ];
+    char name[NAMESZ], rbuf[NMH_BUFSIZ];
     m_getfld_state_t gstate = 0;
     struct comp *c;
     int bufsz;
@@ -637,7 +619,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
      * Read in the message and process the components
      */
 
-    for (state = FLD;;) {
+    for (;;) {
 	bufsz = sizeof(rbuf);
 	state = m_getfld(&gstate, name, rbuf, &bufsz, in);
 	switch (state) {
@@ -661,9 +643,8 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
 	case BODY:
 	    if (fmt_findcomp("body")) {
 		if ((i = strlen(rbuf)) < outwidth) {
-		    bufsz = outwidth - 1;
-		    state = m_getfld(&gstate, name, rbuf + i,
-				     &bufsz, in);
+		    bufsz = min (outwidth, (int) sizeof rbuf - i);
+		    m_getfld(&gstate, name, rbuf + i, &bufsz, in);
 		}
 
 		fmt_addcomptext("body", rbuf);
@@ -685,14 +666,13 @@ finished:
 	for (i = 0; i < comps->size; i += 2) {
 	    c = fmt_findcomp(comps->msgs[i]);
 	    if (c) {
-		if (c->c_text)
-		    free(c->c_text);
+                mh_xfree(c->c_text);
 		c->c_text = getcpy(comps->msgs[i + 1]);
 	    }
 	}
     }
-    fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
-    fputs(buffer, stdout);
+    fmt_scan(fmt, buffer, outwidth, dat, cb);
+    fputs(charstring_buffer (buffer), stdout);
     mlistfree();
 }
 
@@ -701,8 +681,8 @@ finished:
  */
 
 static void
-process_raw(struct format *fmt, struct msgs_array *text, char *buffer,
-	    int bufsize, int outwidth, int *dat, struct fmt_callbacks *cb)
+process_raw(struct format *fmt, struct msgs_array *text, charstring_t buffer,
+	    int outwidth, int *dat, struct fmt_callbacks *cb)
 {
     int i;
     struct comp *c;
@@ -720,13 +700,12 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer,
 
     for (i = 0; i < text->size; i++) {
     	if (c != NULL) {
-	    if (c->c_text != NULL)
-	    	free(c->c_text);
+            mh_xfree(c->c_text);
 	    c->c_text = getcpy(text->msgs[i]);
 	}
 
-	fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
-	fputs(buffer, stdout);
+	fmt_scan(fmt, buffer, outwidth, dat, cb);
+	fputs(charstring_buffer (buffer), stdout);
 	mlistfree();
     }
 }
@@ -755,21 +734,21 @@ test_trace(void *context, struct format *fmt, int num, char *str,
 
     if (str != ctx->str) {
     	if (changed++)
-	    printf(" ");
+            putchar(' ');
 	printf("str=");
 	litputs(str);
 	ctx->str = str;
     }
 
     if (changed)
-    	printf("\n");
+        putchar('\n');
 
     if (strcmp(outbuf, ctx->outbuf) != 0) {
     	printf("outbuf=");
 	litputs(outbuf);
 	putchar('\n');
     	free(ctx->outbuf);
-	ctx->outbuf = getcpy(outbuf);
+	ctx->outbuf = mh_xstrdup(outbuf);
     }
 }
 
@@ -791,7 +770,7 @@ fmt_dump (char *nfs, struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-	register int i;
+	int i;
 
 	if ((i = findlabel(fmt)) >= 0)
 		printf("L%d:", i);
@@ -859,6 +838,8 @@ dumpone(struct format *fmt)
 	case FT_LS_FRIENDLY:
 	case FT_PARSEADDR:
 	case FT_MYMBOX:
+	case FT_GETMYMBOX:
+	case FT_GETMYADDR:
 		printf(", c_name ");
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
@@ -931,6 +912,7 @@ dumpone(struct format *fmt)
 	case FT_LV_LIT:
 	case FT_LV_PLUS_L:
 	case FT_LV_MINUS_L:
+	case FT_LV_MULTIPLY_L:
 	case FT_LV_DIVIDE_L:
 	case FT_LV_MODULO_L:
 		printf(" value %d", fmt->f_value);
@@ -1000,7 +982,7 @@ initlabels(struct format *fmth)
 static int
 findlabel(struct format *addr)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < lused; ++i)
 		if (addr == lvec[i])
@@ -1055,6 +1037,7 @@ f_typestr(int t)
 	case FT_LV_STRLEN: return("LV_STRLEN");
 	case FT_LV_PLUS_L: return("LV_PLUS_L");
 	case FT_LV_MINUS_L: return("LV_MINUS_L");
+	case FT_LV_MULTIPLY_L: return("LV_MULTIPLY_L");
 	case FT_LV_DIVIDE_L: return("LV_DIVIDE_L");
 	case FT_LV_MODULO_L: return("LV_MODULO_L");
 	case FT_LV_CHAR_LEFT: return("LV_CHAR_LEFT");
@@ -1099,6 +1082,8 @@ f_typestr(int t)
 	case FT_FORMATADDR: return("FORMATADDR");
 	case FT_CONCATADDR: return("CONCATADDR");
 	case FT_MYMBOX: return("MYMBOX");
+	case FT_GETMYMBOX: return("GETMYMBOX");
+	case FT_GETMYADDR: return("GETMYADDR");
 #ifdef	FT_ADDTOSEQ
 	case FT_ADDTOSEQ: return("ADDTOSEQ");
 #endif
@@ -1231,13 +1216,13 @@ static unsigned int bufsiz=0;	/* current size of buf */
 static char *
 test_formataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {
@@ -1347,8 +1332,8 @@ mlistfree(void)
 {
     struct mailname *mp, *mp2;
 
-    for (mp = mq.m_next; mp; mp = mp2->m_next) {
-    	mp2 = mp;
+    for (mp = mq.m_next; mp; mp = mp2) {
+	mp2 = mp->m_next;
 	mnfree(mp);
     }
 }