X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdp.c;h=70162b2a0b1055b5134a5032fc08f101d9397765;hp=a5accf53f19031c9b68f8b48ac753221155f8fc2;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/dp.c b/uip/dp.c
index a5accf5..70162b2 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -9,54 +9,44 @@
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
+#include <locale.h>
+#include <sysexits.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}))%>"
 
 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 }
 };
 
+char *version=VERSION;
+
 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)
 {
-	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 = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -68,86 +58,68 @@ main(int argc, char **argv)
 	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;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				exit(EX_USAGE);
+			case UNKWNSW:
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [switches] dates ...", invo_name);
+				print_help(buf, switches, 1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+			case VERSIONSW:
+				print_version(invo_name);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(EX_USAGE, NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
 			}
 		}
 		if (datep > NDATES)
-			adios(NULL, "more than %d dates", NDATES);
+			adios(EX_USAGE, 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(EX_USAGE, 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);
-	return 1;
+	return status;
 }
 
 
 static int
-process(char *date, int length)
+process(char *date)
 {
 	int status = 0;
-	char buffer[WBUFSIZ + 1];
-	register struct comp *cptr;
+	char buffer[BUFSIZ + 1];
+	struct comp *cptr;
 
 	FINDCOMP(cptr, "text");
 	if (cptr)
 		cptr->c_text = date;
-	fmt_scan(fmt, buffer, length, dat);
+	fmt_scan(fmt, buffer, BUFSIZ, dat);
 	fputs(buffer, stdout);
 
 	return status;