=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.23 retrieving revision 1.36 diff -u -p -r1.23 -r1.36 --- mandoc/Attic/man_action.c 2009/10/31 06:10:58 1.23 +++ mandoc/Attic/man_action.c 2010/05/17 22:11:42 1.36 @@ -1,6 +1,6 @@ -/* $Id: man_action.c,v 1.23 2009/10/31 06:10:58 kristaps Exp $ */ +/* $Id: man_action.c,v 1.36 2010/05/17 22:11:42 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -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. */ -#include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include +#include "mandoc.h" #include "libman.h" #include "libmandoc.h" @@ -30,6 +33,8 @@ struct actions { static int post_TH(struct man *); static int post_fi(struct man *); static int post_nf(struct man *); +static int post_AT(struct man *); +static int post_UC(struct man *); const struct actions man_actions[MAN_MAX] = { { NULL }, /* br */ @@ -62,16 +67,15 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* RE */ { NULL }, /* RS */ { NULL }, /* DT */ - { NULL }, /* UC */ + { post_UC }, /* UC */ { NULL }, /* PD */ + { NULL }, /* Sp */ + { post_nf }, /* Vb */ + { post_fi }, /* Ve */ + { post_AT }, /* AT */ }; -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) { @@ -100,7 +104,7 @@ post_fi(struct man *m) { if ( ! (MAN_LITERAL & m->flags)) - if ( ! man_nwarn(m, m->last, WNLITERAL)) + if ( ! man_nmsg(m, m->last, MANDOCERR_NOSCOPE)) return(0); m->flags &= ~MAN_LITERAL; return(1); @@ -112,7 +116,7 @@ post_nf(struct man *m) { if (MAN_LITERAL & m->flags) - if ( ! man_nwarn(m, m->last, WOLITERAL)) + if ( ! man_nmsg(m, m->last, MANDOCERR_SCOPEREP)) return(0); m->flags |= MAN_LITERAL; return(1); @@ -123,8 +127,6 @@ static int post_TH(struct man *m) { struct man_node *n; - char *ep; - long lval; if (m->meta.title) free(m->meta.title); @@ -132,9 +134,11 @@ post_TH(struct man *m) free(m->meta.vol); if (m->meta.source) free(m->meta.source); + if (m->meta.msec) + free(m->meta.msec); - m->meta.title = m->meta.vol = m->meta.source = NULL; - m->meta.msec = 0; + m->meta.title = m->meta.vol = + m->meta.msec = m->meta.source = NULL; m->meta.date = 0; /* ->TITLE<- MSEC DATE SOURCE VOL */ @@ -147,22 +151,21 @@ post_TH(struct man *m) n = n->next; assert(n); + m->meta.msec = mandoc_strdup(n->string); - lval = strtol(n->string, &ep, 10); - if (n->string[0] != '\0' && *ep == '\0') - m->meta.msec = (int)lval; - else if ( ! man_nwarn(m, n, WMSEC)) - return(0); - /* TITLE MSEC ->DATE<- SOURCE VOL */ - if (NULL == (n = n->next)) + n = n->next; + if (n) { + m->meta.date = mandoc_a2time + (MTIME_ISO_8601, n->string); + if (0 == m->meta.date) { + if ( ! man_nmsg(m, n, MANDOCERR_BADDATE)) + return(0); + m->meta.date = time(NULL); + } + } else m->meta.date = time(NULL); - else if (0 == (m->meta.date = man_atotime(n->string))) { - if ( ! man_nwarn(m, n, WDATE)) - return(0); - m->meta.date = time(NULL); - } /* TITLE MSEC DATE ->SOURCE<- VOL */ @@ -174,45 +177,89 @@ post_TH(struct man *m) if (n && (n = n->next)) m->meta.vol = mandoc_strdup(n->string); - /* - * The end document shouldn't have the prologue macros as part - * of the syntax tree (they encompass only meta-data). + /* + * Remove the `TH' node after we've processed it for our + * meta-data. */ + man_node_delete(m, m->last); + return(1); +} - if (m->last->parent->child == m->last) { - m->last->parent->child = NULL; - n = m->last; - m->last = m->last->parent; - m->next = MAN_NEXT_CHILD; - } else { - assert(m->last->prev); - m->last->prev->next = NULL; - n = m->last; - m->last = m->last->prev; - m->next = MAN_NEXT_SIBLING; + +static int +post_AT(struct man *m) +{ + static const char * const unix_versions[] = { + "7th Edition", + "System III", + "System V", + "System V Release 2", + }; + + const char *p, *s; + struct man_node *n, *nn; + + n = m->last->child; + + if (NULL == n || MAN_TEXT != n->type) + p = unix_versions[0]; + else { + s = n->string; + if (0 == strcmp(s, "3")) + p = unix_versions[0]; + else if (0 == strcmp(s, "4")) + p = unix_versions[1]; + else if (0 == strcmp(s, "5")) { + nn = n->next; + if (nn && MAN_TEXT == nn->type && nn->string[0]) + p = unix_versions[3]; + else + p = unix_versions[2]; + } else + p = unix_versions[0]; } - man_node_freelist(n); + m->meta.source = mandoc_strdup(p); + return(1); } -static time_t -man_atotime(const char *p) +static int +post_UC(struct man *m) { - struct tm tm; - char *pp; + static const char * const bsd_versions[] = { + "3rd Berkeley Distribution", + "4th Berkeley Distribution", + "4.2 Berkeley Distribution", + "4.3 Berkeley Distribution", + "4.4 Berkeley Distribution", + }; - memset(&tm, 0, sizeof(struct tm)); + const char *p, *s; + struct man_node *n; - 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)); + n = m->last->child; - return(0); + if (NULL == n || MAN_TEXT != n->type) + p = bsd_versions[0]; + else { + s = n->string; + if (0 == strcmp(s, "3")) + p = bsd_versions[0]; + else if (0 == strcmp(s, "4")) + p = bsd_versions[1]; + else if (0 == strcmp(s, "5")) + p = bsd_versions[2]; + else if (0 == strcmp(s, "6")) + p = bsd_versions[3]; + else if (0 == strcmp(s, "7")) + p = bsd_versions[4]; + else + p = bsd_versions[0]; + } + + m->meta.source = mandoc_strdup(p); + + return(1); }