=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.9 retrieving revision 1.25 diff -u -p -r1.9 -r1.25 --- mandoc/Attic/man_action.c 2009/04/05 16:34:22 1.9 +++ mandoc/Attic/man_action.c 2010/01/01 17:14:27 1.25 @@ -1,44 +1,42 @@ -/* $Id: man_action.c,v 1.9 2009/04/05 16:34:22 kristaps Exp $ */ +/* $Id: man_action.c,v 1.25 2010/01/01 17:14:27 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 copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * 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 + #include #include -#include #include #include #include "libman.h" +#include "libmandoc.h" -#ifdef __linux__ -extern char *strptime(const char *, const char *, struct tm *); -#endif - struct actions { int (*post)(struct man *); }; - static int post_TH(struct man *); -static time_t man_atotime(const char *); +static int post_fi(struct man *); +static int post_nf(struct man *); const struct actions man_actions[MAN_MAX] = { - { NULL }, /* __ */ + { NULL }, /* br */ { post_TH }, /* TH */ { NULL }, /* SH */ { NULL }, /* SS */ @@ -59,9 +57,17 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* I */ { NULL }, /* IR */ { NULL }, /* RI */ - { NULL }, /* br */ { NULL }, /* na */ { NULL }, /* i */ + { NULL }, /* sp */ + { post_nf }, /* nf */ + { post_fi }, /* fi */ + { NULL }, /* r */ + { NULL }, /* RE */ + { NULL }, /* RS */ + { NULL }, /* DT */ + { NULL }, /* UC */ + { NULL }, /* PD */ }; @@ -75,19 +81,44 @@ man_action_post(struct man *m) switch (m->last->type) { case (MAN_TEXT): - break; + /* FALLTHROUGH */ case (MAN_ROOT): - break; + return(1); default: - if (NULL == man_actions[m->last->tok].post) - break; - return((*man_actions[m->last->tok].post)(m)); + break; } + + if (NULL == man_actions[m->last->tok].post) + return(1); + return((*man_actions[m->last->tok].post)(m)); +} + + +static int +post_fi(struct man *m) +{ + + if ( ! (MAN_LITERAL & m->flags)) + if ( ! man_nwarn(m, m->last, WNLITERAL)) + return(0); + m->flags &= ~MAN_LITERAL; return(1); } static int +post_nf(struct man *m) +{ + + if (MAN_LITERAL & m->flags) + if ( ! man_nwarn(m, m->last, WOLITERAL)) + return(0); + m->flags |= MAN_LITERAL; + return(1); +} + + +static int post_TH(struct man *m) { struct man_node *n; @@ -109,46 +140,43 @@ post_TH(struct man *m) n = m->last->child; assert(n); + m->meta.title = mandoc_strdup(n->string); - if (NULL == (m->meta.title = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); - /* TITLE ->MSEC<- DATE SOURCE VOL */ n = n->next; assert(n); - errno = 0; lval = strtol(n->string, &ep, 10); if (n->string[0] != '\0' && *ep == '\0') m->meta.msec = (int)lval; - else if ( ! man_vwarn(m, n->line, n->pos, "invalid section")) + 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_nwarn(m, n, WDATE)) + 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_vwarn(m, n->line, n->pos, "invalid date")) - return(0); - m->meta.date = time(NULL); - } /* TITLE MSEC DATE ->SOURCE<- VOL */ if (n && (n = n->next)) - if (NULL == (m->meta.source = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); + m->meta.source = mandoc_strdup(n->string); /* TITLE MSEC DATE SOURCE ->VOL<- */ if (n && (n = n->next)) - if (NULL == (m->meta.vol = strdup(n->string))) - return(man_verr(m, n->line, n->pos, - "memory exhausted")); + m->meta.vol = mandoc_strdup(n->string); /* * The end document shouldn't have the prologue macros as part @@ -156,12 +184,10 @@ post_TH(struct man *m) */ if (m->last->parent->child == m->last) { - assert(MAN_ROOT == m->last->parent->type); m->last->parent->child = NULL; n = m->last; m->last = m->last->parent; m->next = MAN_NEXT_CHILD; - assert(m->last == m->first); } else { assert(m->last->prev); m->last->prev->next = NULL; @@ -172,25 +198,4 @@ post_TH(struct man *m) man_node_freelist(n); return(1); -} - - -static time_t -man_atotime(const char *p) -{ - struct tm tm; - char *pp; - - (void)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); }