=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_action.c,v retrieving revision 1.46 retrieving revision 1.50 diff -u -p -r1.46 -r1.50 --- mandoc/Attic/mdoc_action.c 2009/10/29 04:34:38 1.46 +++ mandoc/Attic/mdoc_action.c 2010/01/01 17:14:29 1.50 @@ -1,4 +1,4 @@ -/* $Id: mdoc_action.c,v 1.46 2009/10/29 04:34:38 kristaps Exp $ */ +/* $Id: mdoc_action.c,v 1.50 2010/01/01 17:14:29 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,12 +14,15 @@ * 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 #endif #include -#include #include #include #include @@ -43,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); @@ -504,7 +503,6 @@ post_dt(POST_ARGS) if (cp) { /* FIXME: where is strtonum!? */ m->meta.vol = mandoc_strdup(cp); - errno = 0; lval = strtol(nn->string, &ep, 10); if (nn->string[0] != '\0' && *ep == '\0') m->meta.msec = (int)lval; @@ -820,8 +818,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) @@ -831,7 +828,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); @@ -890,6 +889,7 @@ pre_dl(PRE_ARGS) } +/* ARGSUSED */ static int pre_offset(PRE_ARGS) {