Indentation must be measured in units of the surrounding text,

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index ad370358a9a28fabae62f31e1a3d83b51128b516..d265463b4efeb092cf554f41931308e1265a02cf 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.96 2015/10/13 23:30:50 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.98 2015/11/12 22:44:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,8 +32,6 @@
 #include "mandoc_aux.h"
 #include "libmandoc.h"
 
-#define DATESIZE 32
-
 static int      a2time(time_t *, const char *, const char *);
 static char    *time2a(time_t);
 
@@ -480,17 +478,27 @@ time2a(time_t t)
         * up to 2 characters for the day + comma + blank
         * 4 characters for the year and a terminating '\0'
         */
+
        p = buf = mandoc_malloc(10 + 4 + 4 + 1);
 
-       if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm)))
+       if ((ssz = strftime(p, 10 + 1, "%B ", tm)) == 0)
                goto fail;
        p += (int)ssz;
 
-       if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)))
+       /*
+        * The output format is just "%d" here, not "%2d" or "%02d".
+        * That's also the reason why we can't just format the
+        * date as a whole with "%B %e, %Y" or "%B %d, %Y".
+        * Besides, the present approach is less prone to buffer
+        * overflows, in case anybody should ever introduce the bug
+        * of looking at LC_TIME.
+        */
+
+       if ((isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)) == -1)
                goto fail;
        p += isz;
 
-       if (0 == strftime(p, 4 + 1, "%Y", tm))
+       if (strftime(p, 4 + 1, "%Y", tm) == 0)
                goto fail;
        return buf;
 
@@ -502,23 +510,29 @@ fail:
 char *
 mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 {
-       char            *out;
        time_t           t;
 
-       if (NULL == in || '\0' == *in ||
-           0 == strcmp(in, "$" "Mdocdate$")) {
+       /* No date specified: use today's date. */
+
+       if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) {
                mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);
-               time(&t);
+               return time2a(time(NULL));
        }
-       else if (a2time(&t, "%Y-%m-%d", in))
-               t = 0;
-       else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
-           !a2time(&t, "%b %d, %Y", in)) {
+
+       /* Valid mdoc(7) date format. */
+
+       if (a2time(&t, "$" "Mdocdate: %b %d %Y $", in) ||
+           a2time(&t, "%b %d, %Y", in))
+               return time2a(t);
+
+       /* Do not warn about the legacy man(7) format. */
+
+       if ( ! a2time(&t, "%Y-%m-%d", in))
                mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
-               t = 0;
-       }
-       out = t ? time2a(t) : NULL;
-       return out ? out : mandoc_strdup(in);
+
+       /* Use any non-mdoc(7) date verbatim. */
+
+       return mandoc_strdup(in);
 }
 
 int