aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mandoc.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-06-11 19:37:00 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-06-11 19:37:00 +0000
commit565360053d62a3b5df9e9ccc0926c3e6340fef63 (patch)
treef4f2345878db47d41e74be046a7f42937eef4378 /mandoc.c
parentd686462c7725fa8c3cab24acbaf5242bc67ad61a (diff)
downloadmandoc-565360053d62a3b5df9e9ccc0926c3e6340fef63.tar.gz
mandoc-565360053d62a3b5df9e9ccc0926c3e6340fef63.tar.zst
mandoc-565360053d62a3b5df9e9ccc0926c3e6340fef63.zip
Style message about legacy man(7) date format in mdoc(7) documents
and operating system dependent messages about missing or unexpected Mdocdate; inspired by mdoclint(1).
Diffstat (limited to 'mandoc.c')
-rw-r--r--mandoc.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/mandoc.c b/mandoc.c
index fc360def..003bc066 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/* $Id: mandoc.c,v 1.100 2017/06/02 19:21:23 schwarze Exp $ */
+/* $Id: mandoc.c,v 1.101 2017/06/11 19:37:01 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,8 +28,9 @@
#include <string.h>
#include <time.h>
-#include "mandoc.h"
#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
#include "libmandoc.h"
static int a2time(time_t *, const char *, const char *);
@@ -518,14 +519,14 @@ fail:
}
char *
-mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
+mandoc_normdate(struct roff_man *man, char *in, int ln, int pos)
{
time_t t;
/* 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);
+ mandoc_msg(MANDOCERR_DATE_MISSING, man->parse, ln, pos, NULL);
return time2a(time(NULL));
}
@@ -535,10 +536,13 @@ mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
a2time(&t, "%b %d, %Y", in))
return time2a(t);
- /* Do not warn about the legacy man(7) format. */
+ /* In man(7), do not warn about the legacy format. */
- if ( ! a2time(&t, "%Y-%m-%d", in))
- mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
+ if (a2time(&t, "%Y-%m-%d", in) == 0)
+ mandoc_msg(MANDOCERR_DATE_BAD, man->parse, ln, pos, in);
+ else if (man->macroset == MACROSET_MDOC)
+ mandoc_vmsg(MANDOCERR_DATE_LEGACY, man->parse,
+ ln, pos, "Dd %s", in);
/* Use any non-mdoc(7) date verbatim. */