Wind man-page date back to the earliest git revision, UTC.

[nmh] / uip / dp.c

diff --git a/uip/dp.c b/uip/dp.c
index eef77908115421b0cbd1671e9f394801025dda9a..cbb48bb68b09be1cf8a4c04ab152ce709ee32d55 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -8,13 +8,13 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 #include <h/fmt_scan.h>
 #include <h/tws.h>
 
 #define        NDATES 100
 
 #define        WIDTH 78
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 
 #define        NDATES 100
 
 #define        WIDTH 78

-#define        WBUFSIZ BUFSIZ

 
 #define        FORMAT "%<(nodate{text})error: %{text}%|%(putstr(pretty{text}))%>"
 
 
 #define        FORMAT "%<(nodate{text})error: %{text}%|%(putstr(pretty{text}))%>"
 


@@ -46,22 +46,14 @@ static int process (char *, int);
 int
 main (int argc, char **argv)
 {
 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 *cp, *form = NULL, *format = NULL, *nfs;

-    char buf[BUFSIZ], **argp, **arguments;
-    char *dates[NDATES];
+    char buf[BUFSIZ], **argp;
+    char *dates[NDATES + 1]; /* Includes terminating NULL. */

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
+    if (nmh_init(argv[0], 2)) { return 1; }

 
 

+    argp = getarguments (invo_name, argc, argv, 1);

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -98,7 +90,7 @@ main (int argc, char **argv)
                    continue;
            }
        }
                    continue;
            }
        }

-       if (datep > NDATES)
+       if (datep == NDATES)

            adios (NULL, "more than %d dates", NDATES);
        else
            dates[datep++] = cp;
            adios (NULL, "more than %d dates", NDATES);
        else
            dates[datep++] = cp;


@@ -111,13 +103,16 @@ main (int argc, char **argv)
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
 
     /* 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 = WIDTH / 2;

+       }

        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;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;


@@ -140,17 +135,18 @@ static int
 process (char *date, int length)
 {
     int status = 0;
 process (char *date, int length)
 {
     int status = 0;

-    char buffer[WBUFSIZ + 1];
-    register struct comp *cptr;
+    charstring_t scanl =
+       charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
+    struct comp *cptr;

 
     cptr = fmt_findcomp ("text");
     if (cptr) {
 
     cptr = fmt_findcomp ("text");
     if (cptr) {

-       if (cptr->c_text)
-           free(cptr->c_text);
-       cptr->c_text = getcpy(date);
+        mh_xfree(cptr->c_text);
+       cptr->c_text = mh_xstrdup(date);

     }
     }

-    fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);
-    fputs (buffer, stdout);
+    fmt_scan (fmt, scanl, length, dat, NULL);
+    fputs (charstring_buffer (scanl), stdout);
+    charstring_free (scanl);

 
     return status;
 }
 
     return status;
 }