=================================================================== RCS file: /cvs/mandoc/Attic/man_action.c,v retrieving revision 1.4 retrieving revision 1.9 diff -u -p -r1.4 -r1.9 --- mandoc/Attic/man_action.c 2009/03/26 09:55:39 1.4 +++ mandoc/Attic/man_action.c 2009/04/05 16:34:22 1.9 @@ -1,4 +1,4 @@ -/* $Id: man_action.c,v 1.4 2009/03/26 09:55:39 kristaps Exp $ */ +/* $Id: man_action.c,v 1.9 2009/04/05 16:34:22 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -19,9 +19,7 @@ #include #include -#include #include -#include #include #include @@ -37,7 +35,7 @@ struct actions { static int post_TH(struct man *); -static time_t man_atotime(const char *); +static time_t man_atotime(const char *); const struct actions man_actions[MAN_MAX] = { { NULL }, /* __ */ @@ -60,6 +58,10 @@ const struct actions man_actions[MAN_MAX] = { { NULL }, /* B */ { NULL }, /* I */ { NULL }, /* IR */ + { NULL }, /* RI */ + { NULL }, /* br */ + { NULL }, /* na */ + { NULL }, /* i */ }; @@ -109,7 +111,8 @@ post_TH(struct man *m) assert(n); if (NULL == (m->meta.title = strdup(n->string))) - return(man_verr(m, n->line, n->pos, "malloc")); + return(man_verr(m, n->line, n->pos, + "memory exhausted")); /* TITLE ->MSEC<- DATE SOURCE VOL */ @@ -125,12 +128,9 @@ post_TH(struct man *m) /* 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))) { + 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); @@ -138,15 +138,17 @@ post_TH(struct man *m) /* TITLE MSEC DATE ->SOURCE<- VOL */ - if ((n = n->next)) + if (n && (n = n->next)) if (NULL == (m->meta.source = strdup(n->string))) - return(man_verr(m, n->line, n->pos, "malloc")); + return(man_verr(m, n->line, n->pos, + "memory exhausted")); /* TITLE MSEC DATE SOURCE ->VOL<- */ - if ((n = n->next)) + if (n && (n = n->next)) if (NULL == (m->meta.vol = strdup(n->string))) - return(man_verr(m, n->line, n->pos, "malloc")); + return(man_verr(m, n->line, n->pos, + "memory exhausted")); /* * The end document shouldn't have the prologue macros as part