Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / dp.c

diff --git a/uip/dp.c b/uip/dp.c
index 67b2fee..aee4b29 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -12,21 +12,14 @@
 
 #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}))%>"
 
 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
+#define VERSIONSW  1
+       { "Version", 0 },
+#define HELPSW  2
        { "help", 0 },
        { NULL, 0 }
 };
@@ -36,120 +29,97 @@ static struct format *fmt;
 static int dat[5];
 
 /*
-** prototypes
-*/
-int sc_width (void);  /* from termsbr.c */
-
-/*
 ** static prototypes
 */
-static int process (char *, int);
+static int process(char *);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
-       int datep = 0, width = 0, status = 0;
-       char *cp, *form = NULL, *format = NULL, *nfs;
+       int datep = 0, status = 0;
+       char *cp, *form = NULL, *fmtstr;
        char buf[BUFSIZ], **argp, **arguments;
        char *dates[NDATES];
 
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex (argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
 
-       arguments = getarguments (invo_name, argc, argv, 1);
+       arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
        while ((cp = *argp++)) {
                if (*cp == '-') {
-                       switch (smatch (++cp, switches)) {
-                               case AMBIGSW:
-                                       ambigsw (cp, switches);
-                                       done (1);
-                               case UNKWNSW:
-                                       adios (NULL, "-%s unknown", cp);
-
-                               case HELPSW:
-                                       snprintf (buf, sizeof(buf), "%s [switches] dates ...",
-                                               invo_name);
-                                       print_help (buf, switches, 1);
-                                       done (1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done (1);
-
-                               case FORMSW:
-                                       if (!(form = *argp++) || *form == '-')
-                                               adios (NULL, "missing argument to %s", argp[-2]);
-                                       format = NULL;
-                                       continue;
-                               case FMTSW:
-                                       if (!(format = *argp++) || *format == '-')
-                                               adios (NULL, "missing argument to %s", argp[-2]);
-                                       form = NULL;
-                                       continue;
-
-                               case WIDTHSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios (NULL, "missing argument to %s", argp[-2]);
-                                       width = atoi (cp);
-                                       continue;
+                       switch (smatch(++cp, switches)) {
+                       case AMBIGSW:
+                               ambigsw(cp, switches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [switches] dates ...", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case FORMSW:
+                               if (!(form = *argp++) || *form == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               continue;
+
                        }
                }
                if (datep > NDATES)
-                       adios (NULL, "more than %d dates", NDATES);
+                       adios(NULL, "more than %d dates", NDATES);
                else
                        dates[datep++] = cp;
        }
        dates[datep] = NULL;
 
        if (datep == 0)
-               adios (NULL, "usage: %s [switches] dates ...", invo_name);
+               adios(NULL, "usage: %s [switches] dates ...", invo_name);
 
        /* get new format string */
-       nfs = new_fs (form, format, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
-       if (width == 0) {
-               if ((width = sc_width ()) < WIDTH / 2)
-                       width = WIDTH / 2;
-               width -= 2;
-       }
-       if (width > WBUFSIZ)
-               width = WBUFSIZ;
-       fmt_compile (nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        dat[0] = 0;
        dat[1] = 0;
        dat[2] = 0;
-       dat[3] = width;
+       dat[3] = BUFSIZ;
        dat[4] = 0;
 
        for (datep = 0; dates[datep]; datep++)
-               status += process (dates[datep], width);
+               status += process(dates[datep]);
 
-       context_save ();  /* save the context file */
-       done (status);
+       context_save();  /* save the context file */
+       done(status);
        return 1;
 }
 
 
 static int
-process (char *date, int length)
+process(char *date)
 {
        int status = 0;
-       char buffer[WBUFSIZ + 1];
+       char buffer[BUFSIZ + 1];
        register struct comp *cptr;
 
-       FINDCOMP (cptr, "text");
+       FINDCOMP(cptr, "text");
        if (cptr)
                cptr->c_text = date;
-       fmt_scan (fmt, buffer, length, dat);
-       fputs (buffer, stdout);
+       fmt_scan(fmt, buffer, BUFSIZ, dat);
+       fputs(buffer, stdout);
 
        return status;
 }