Merge remote-tracking branch 'origin' into xoauth

[nmh] / uip / dp.c

diff --git a/uip/dp.c b/uip/dp.c
index dabdd74c84adde9eb358988a2b5aa1e64def9e13..cf8f9b1406210809429d5bc875ded7ab31d59ed1 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -14,7 +14,6 @@
 #define        NDATES 100
 
 #define        WIDTH 78
-#define        WBUFSIZ BUFSIZ
 
 #define        FORMAT "%<(nodate{text})error: %{text}%|%(putstr(pretty{text}))%>"
 
@@ -46,7 +45,7 @@ static int process (char *, int);
 int
 main (int argc, char **argv)
 {
-    int datep = 0, width = 0, status = 0;
+    int datep = 0, width = -1, status = 0;
     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp, **arguments;
     char *dates[NDATES];
@@ -105,13 +104,16 @@ main (int argc, char **argv)
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
 
-    if (width == 0) {
-       if ((width = sc_width ()) < WIDTH / 2)
+    if (width == -1) {
+       if ((width = sc_width ()) < WIDTH / 2) {
+           /* Default:  width of the terminal, but at least WIDTH/2. */
            width = WIDTH / 2;
+       }
        width -= 2;
+    } else if (width == 0) {
+       /* Unlimited width.  */
+       width = INT_MAX;
     }
-    if (width > WBUFSIZ)
-       width = WBUFSIZ;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
@@ -134,7 +136,8 @@ static int
 process (char *date, int length)
 {
     int status = 0;
-    char buffer[WBUFSIZ + 1];
+    charstring_t scanl =
+       charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
     register struct comp *cptr;
 
     cptr = fmt_findcomp ("text");
@@ -143,8 +146,9 @@ process (char *date, int length)
            free(cptr->c_text);
        cptr->c_text = getcpy(date);
     }
-    fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat, NULL);
-    fputs (buffer, stdout);
+    fmt_scan (fmt, scanl, length, dat, NULL);
+    fputs (charstring_buffer (scanl), stdout);
+    charstring_free (scanl);
 
     return status;
 }