X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/a1af4f3969c284fb243f1c0534b332232d54dd98..2b3f4260250d09aee45d955266bc57b3e5efe335:/mdoc_action.c?ds=sidebyside

diff --git a/mdoc_action.c b/mdoc_action.c
index 56057e06..10888a1d 100644
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_action.c,v 1.48 2009/10/31 06:10:58 kristaps Exp $ */
+/*	$Id: mdoc_action.c,v 1.51 2010/03/31 07:13:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef	OSNAME
 #include <sys/utsname.h>
 #endif
@@ -42,10 +46,6 @@ static	int	  concat(struct mdoc *, char *,
 			const struct mdoc_node *, size_t);
 static	inline int order_rs(int);
 
-#ifdef __linux__
-extern	size_t	  strlcat(char *, const char *, size_t);
-#endif
-
 static	int	  post_ar(POST_ARGS);
 static	int	  post_at(POST_ARGS);
 static	int	  post_bl(POST_ARGS);
@@ -647,7 +647,8 @@ static int
 post_bl_width(POST_ARGS)
 {
 	size_t		  width;
-	int		  i, tok;
+	int		  i;
+	enum mdoct	  tok;
 	char		  buf[NUMSIZ];
 	char		 *p;
 
@@ -818,8 +819,7 @@ post_ar(POST_ARGS)
 
 
 /*
- * Parse the date field in `Dd', primarily through mdoc_atotime().
- * FIXME: push mdoc_atotime() into here.
+ * Parse the date field in `Dd'.
  */
 static int
 post_dd(POST_ARGS)
@@ -829,7 +829,9 @@ post_dd(POST_ARGS)
 	if ( ! concat(m, buf, n->child, DATESIZ))
 		return(0);
 
-	m->meta.date = mdoc_atotime(buf);
+	m->meta.date = mandoc_a2time
+		(MTIME_MDOCDATE | MTIME_CANONICAL, buf);
+
 	if (0 == m->meta.date) {
 		if ( ! mdoc_nwarn(m, n, EBADDATE))
 			return(0);