=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.2 retrieving revision 1.23 diff -u -p -r1.2 -r1.23 --- mandoc/Attic/man_action.c 2009/03/25 16:07:36 1.2 +++ mandoc/Attic/man_action.c 2009/10/31 06:10:58 1.23 @@ -1,43 +1,38 @@ -/* $Id: man_action.c,v 1.2 2009/03/25 16:07:36 kristaps Exp $ */ +/* $Id: man_action.c,v 1.23 2009/10/31 06:10:58 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. */ #include #include -#include -#include -#include #include #include #include "libman.h" +#include "libmandoc.h" - 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 */ @@ -57,9 +52,26 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* B */ { NULL }, /* I */ { NULL }, /* IR */ + { NULL }, /* RI */ + { NULL }, /* na */ + { NULL }, /* i */ + { NULL }, /* sp */ + { post_nf }, /* nf */ + { post_fi }, /* fi */ + { NULL }, /* r */ + { NULL }, /* RE */ + { NULL }, /* RS */ + { NULL }, /* DT */ + { NULL }, /* UC */ + { 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) { @@ -70,19 +82,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; @@ -104,58 +141,56 @@ 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, "malloc")); - /* 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)) { + if (NULL == (n = n->next)) m->meta.date = time(NULL); - return(1); - } - - if (0 == (m->meta.date = man_atotime(n->string))) { - if ( ! man_vwarn(m, n->line, n->pos, "invalid date")) + 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 */ - if ((n = n->next)) - if (NULL == (m->meta.source = strdup(n->string))) - return(man_verr(m, n->line, n->pos, "malloc")); + if (n && (n = n->next)) + m->meta.source = mandoc_strdup(n->string); /* TITLE MSEC DATE SOURCE ->VOL<- */ - if ((n = n->next)) - if (NULL == (m->meta.vol = strdup(n->string))) - return(man_verr(m, n->line, n->pos, "malloc")); + 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). */ - 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); + 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; + } man_node_freelist(n); return(1); @@ -168,7 +203,7 @@ man_atotime(const char *p) struct tm tm; char *pp; - (void)memset(&tm, 0, sizeof(struct tm)); + memset(&tm, 0, sizeof(struct tm)); if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp) return(mktime(&tm));