X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdp.c;h=0db0ba52a85643033c7c4878ea00d9441e7bbc0d;hp=c94c8eac0ccfb33cf48e69b9e15c1e729b39b492;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c

diff --git a/uip/dp.c b/uip/dp.c
index c94c8ea..0db0ba5 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -1,4 +1,3 @@
-
 /*
  * dp.c -- parse dates 822-style
  *
@@ -11,25 +10,25 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 
-#define	NDATES 100
+#define NDATES 100
 
-#define	WIDTH 78
-#define	WBUFSIZ BUFSIZ
+#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
-    { "help", 0 },
-    { NULL, 0 }
+#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 }
 };
 
 static struct format *fmt;
@@ -50,107 +49,107 @@ static int process (char *, int);
 int
 main (int argc, char **argv)
 {
-    int datep = 0, width = 0, status = 0;
-    char *cp, *form = NULL, *format = NULL, *nfs;
-    char buf[BUFSIZ], **argp, **arguments;
-    char *dates[NDATES];
+	int datep = 0, width = 0, status = 0;
+	char *cp, *form = NULL, *format = NULL, *nfs;
+	char buf[BUFSIZ], **argp, **arguments;
+	char *dates[NDATES];
 
 #ifdef LOCALE
-    setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 #endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    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;
-	    }
+	invo_name = r1bindex (argv[0], '/');
+
+	/* read user profile/context */
+	context_read();
+
+	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;
+			}
+		}
+		if (datep > 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);
+
+	/* get new format string */
+	nfs = new_fs (form, format, FORMAT);
+
+	if (width == 0) {
+		if ((width = sc_width ()) < WIDTH / 2)
+			width = WIDTH / 2;
+		width -= 2;
 	}
-	if (datep > 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);
-
-    /* get new format string */
-    nfs = new_fs (form, format, FORMAT);
-
-    if (width == 0) {
-	if ((width = sc_width ()) < WIDTH / 2)
-	    width = WIDTH / 2;
-	width -= 2;
-    }
-    if (width > WBUFSIZ)
-	width = WBUFSIZ;
-    fmt_compile (nfs, &fmt);
-
-    dat[0] = 0;
-    dat[1] = 0;
-    dat[2] = 0;
-    dat[3] = width;
-    dat[4] = 0;
-
-    for (datep = 0; dates[datep]; datep++)
-	status += process (dates[datep], width);
-
-    context_save ();	/* save the context file */
-    done (status);
-    return 1;
+	if (width > WBUFSIZ)
+		width = WBUFSIZ;
+	fmt_compile (nfs, &fmt);
+
+	dat[0] = 0;
+	dat[1] = 0;
+	dat[2] = 0;
+	dat[3] = width;
+	dat[4] = 0;
+
+	for (datep = 0; dates[datep]; datep++)
+		status += process (dates[datep], width);
+
+	context_save ();  /* save the context file */
+	done (status);
+	return 1;
 }
 
 
 static int
 process (char *date, int length)
 {
-    int status = 0;
-    char buffer[WBUFSIZ + 1];
-    register struct comp *cptr;
+	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);
+	FINDCOMP (cptr, "text");
+	if (cptr)
+		cptr->c_text = date;
+	fmt_scan (fmt, buffer, length, dat);
+	fputs (buffer, stdout);
 
-    return status;
+	return status;
 }