diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-11-02 06:22:44 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-11-02 06:22:44 +0000 |
commit | a39b97ef0c1432973b5d815709925a82507c100b (patch) | |
tree | 9ca38e01caeb3a842bd0520375f0e52e83099515 /man_action.c | |
parent | f50364828978249af6c0a2c5e92ee923b8d86c75 (diff) | |
download | mandoc-a39b97ef0c1432973b5d815709925a82507c100b.tar.gz mandoc-a39b97ef0c1432973b5d815709925a82507c100b.tar.zst mandoc-a39b97ef0c1432973b5d815709925a82507c100b.zip |
Added mandoc_a2time() for proper date conversion.
Fitted TH and Dd handlers to use mandoc_a2time().
Documented date syntax for -man, fixed documentation for -mdoc.
Diffstat (limited to 'man_action.c')
-rw-r--r-- | man_action.c | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/man_action.c b/man_action.c index a39f05fb..5a660715 100644 --- a/man_action.c +++ b/man_action.c @@ -1,4 +1,4 @@ -/* $Id: man_action.c,v 1.23 2009/10/31 06:10:58 kristaps Exp $ */ +/* $Id: man_action.c,v 1.24 2009/11/02 06:22:45 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -66,11 +66,6 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* PD */ }; -static time_t man_atotime(const char *); -#ifdef __linux__ -extern char *strptime(const char *, const char *, struct tm *); -#endif - int man_action_post(struct man *m) @@ -156,13 +151,18 @@ post_TH(struct man *m) /* TITLE MSEC ->DATE<- SOURCE VOL */ - if (NULL == (n = n->next)) - m->meta.date = time(NULL); - else if (0 == (m->meta.date = man_atotime(n->string))) { - if ( ! man_nwarn(m, n, WDATE)) - return(0); + n = n->next; + if (n) { + m->meta.date = mandoc_a2time + (MTIME_ISO_8601, n->string); + + if (0 == m->meta.date) { + if ( ! man_nwarn(m, n, WDATE)) + return(0); + m->meta.date = time(NULL); + } + } else m->meta.date = time(NULL); - } /* TITLE MSEC DATE ->SOURCE<- VOL */ @@ -195,24 +195,3 @@ post_TH(struct man *m) man_node_freelist(n); return(1); } - - -static time_t -man_atotime(const char *p) -{ - struct tm tm; - char *pp; - - memset(&tm, 0, sizeof(struct tm)); - - if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp) - return(mktime(&tm)); - if ((pp = strptime(p, "%d %b %Y", &tm)) && 0 == *pp) - return(mktime(&tm)); - if ((pp = strptime(p, "%b %d, %Y", &tm)) && 0 == *pp) - return(mktime(&tm)); - if ((pp = strptime(p, "%b %Y", &tm)) && 0 == *pp) - return(mktime(&tm)); - - return(0); -} |