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

diff --git a/uip/dp.c b/uip/dp.c
index 1a91678..70162b2 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
+#include <locale.h>
+#include <sysexits.h>
 
 #define NDATES 100
 
@@ -24,6 +26,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 static struct format *fmt;
 
 static int dat[5];
@@ -56,35 +60,35 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [switches] dates ...", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
-					adios(NULL, "missing argument to %s",
+					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 */
 	fmtstr = new_fs(form, FORMAT);
@@ -101,8 +105,7 @@ main(int argc, char **argv)
 		status += process(dates[datep]);
 
 	context_save();  /* save the context file */
-	done(status);
-	return 1;
+	return status;
 }
 
 
@@ -111,7 +114,7 @@ process(char *date)
 {
 	int status = 0;
 	char buffer[BUFSIZ + 1];
-	register struct comp *cptr;
+	struct comp *cptr;
 
 	FINDCOMP(cptr, "text");
 	if (cptr)