X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..b0aa8cdb1c264e42d4931ca24968689c73381278:/uip/dp.c

diff --git a/uip/dp.c b/uip/dp.c
index c94c8eac..7e53a5c9 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -8,39 +8,35 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #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}))%>"
 
-static struct swit switches[] = {
-#define	FORMSW                0
-    { "form formatfile", 0 },
-#define	FMTSW                 1
-    { "format string", 5 },
-#define	WIDTHSW               2
-    { "width columns", 0 },
-#define VERSIONSW             3
-    { "version", 0 },
-#define	HELPSW                4
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define DP_SWITCHES \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(DP);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(DP, switches);
+#undef X
 
 static struct format *fmt;
 
 static int dat[5];
 
-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-
 /*
  * static prototypes
  */
@@ -50,18 +46,12 @@ 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];
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -79,10 +69,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] dates ...",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
@@ -115,14 +105,17 @@ 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);
+    fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
     dat[1] = 0;
@@ -134,6 +127,7 @@ main (int argc, char **argv)
 	status += process (dates[datep], width);
 
     context_save ();	/* save the context file */
+    fmt_free (fmt, 1);
     done (status);
     return 1;
 }
@@ -143,14 +137,18 @@ static int
 process (char *date, int length)
 {
     int status = 0;
-    char buffer[WBUFSIZ + 1];
-    register struct comp *cptr;
-
-    FINDCOMP (cptr, "text");
-    if (cptr)
-	cptr->c_text = date;
-    fmt_scan (fmt, buffer, length, dat);
-    fputs (buffer, stdout);
+    charstring_t scanl =
+	charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
+    struct comp *cptr;
+
+    cptr = fmt_findcomp ("text");
+    if (cptr) {
+        mh_xfree(cptr->c_text);
+	cptr->c_text = mh_xstrdup(date);
+    }
+    fmt_scan (fmt, scanl, length, dat, NULL);
+    fputs (charstring_buffer (scanl), stdout);
+    charstring_free (scanl);
 
     return status;
 }