Dynamically allocate space for the output of fmt_scan(), using

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index b39d0d527b4a753c5698b9059456f18207f1d9c8..ad9dcef0373d66d626778cf3486fdbdc2e1508d1 100644 (file)
--- 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) \
@@ -83,19 +82,20 @@ static void assignlabel(struct format *);
 static char *f_typestr(int);
 static char *c_typestr(int);
 static char *c_flagsstr(int);
-static void litputs(char *);
+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 *, char *);
+static void test_trace(void *, struct format *, int, char *, const char *);
 static char *test_formataddr(char *, char *);
 static char *test_concataddr(char *, char *);
 static int insert(struct mailname *);
@@ -110,24 +110,19 @@ 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];
     struct fmt_callbacks cb, *cbp = NULL;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -170,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 == '-')
@@ -327,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 (mode == MESSAGE) 
+    if (outputsize == 0) {
+       if (mode == MESSAGE)
            outputsize = sc_width();
        else
-           outputsize = bufsize - 1;
+           outputsize = INT_MAX;
     }
 
     dat[0] = msgnum;
@@ -381,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) {
@@ -393,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);
@@ -416,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];
@@ -466,8 +448,8 @@ process_addresses(struct format *fmt, struct msgs_array *addrs, char *buffer,
                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)
@@ -487,8 +469,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];
@@ -506,11 +488,11 @@ process_messages(struct format *fmt, struct msgs_array *comps,
     if (files) {
        for (i = 0; i < msgs->size; i++) {
            if ((in = fopen(cp = msgs->msgs[i], "r")) == NULL) {
-               admonish(cp, "unable to open file");
+               admonish(cp, "unable to open file");
                continue;
            }
            process_single_file(in, comps, dat, msgsize, fmt, buffer,
-                               bufsize, outwidth, cb);
+                               outwidth, cb);
        }
 
        return;
@@ -591,7 +573,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
             */
 
            process_single_file(in, comps, dat, msgsize, fmt, buffer,
-                               bufsize, outwidth, cb);
+                               outwidth, cb);
        }
     }
 
@@ -606,8 +588,8 @@ 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];
@@ -697,8 +679,8 @@ finished:
            }
        }
     }
-    fmt_scan(fmt, buffer, bufsize, outwidth, dat, cb);
-    fputs(buffer, stdout);
+    fmt_scan(fmt, buffer, outwidth, dat, cb);
+    fputs(charstring_buffer (buffer), stdout);
     mlistfree();
 }
 
@@ -707,8 +689,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;
@@ -731,8 +713,8 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer,
            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();
     }
 }
@@ -745,7 +727,8 @@ process_raw(struct format *fmt, struct msgs_array *text, char *buffer,
  */
 
 static void
-test_trace(void *context, struct format *fmt, int num, char *str, char *outbuf)
+test_trace(void *context, struct format *fmt, int num, char *str,
+          const char *outbuf)
 {
     struct trace_context *ctx = (struct trace_context *) context;
     int changed = 0;
@@ -1153,7 +1136,7 @@ c_flagsstr(int t)
 }
 
 static void
-litputs(char *s)
+litputs(const char *s)
 {
        if (s) {
                putc('"', stdout);