Commited relaxation of title-less document error-out noted by Christian Weisgerber...

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index 56057e0689b9112a0c69ac683ead713f9258b23c..10888a1d1b49e4c5abc1c6279d73280d5114a8ae 100644 (file)
--- 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>
  *
 /*
  * 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.
  */
  * 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
 #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);
 
                        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);
 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;
 post_bl_width(POST_ARGS)
 {
        size_t            width;

-       int               i, tok;
+       int               i;
+       enum mdoct        tok;

        char              buf[NUMSIZ];
        char             *p;
 
        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)
  */
 static int
 post_dd(POST_ARGS)


@@ -829,7 +829,9 @@ post_dd(POST_ARGS)
        if ( ! concat(m, buf, n->child, DATESIZ))
                return(0);
 
        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);
        if (0 == m->meta.date) {
                if ( ! mdoc_nwarn(m, n, EBADDATE))
                        return(0);