`IP' and `TP' correctly handle width arguments.

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index a19dfa0f63c09eb87a37493855eb74df0d54da6e..c92e7ac59d9382de8797854cb2cabd5c340276fa 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,27 +1,23 @@
-/* $Id: man_action.c,v 1.4 2009/03/26 09:55:39 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.15 2009/08/13 11:45:29 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * 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 <sys/utsname.h>
 
 #include <assert.h>
-#include <err.h>
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -37,10 +33,10 @@ 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 }, /* __ */
+       { NULL }, /* br */
        { post_TH }, /* TH */
        { NULL }, /* SH */
        { NULL }, /* SS */
@@ -60,6 +56,13 @@ const        struct actions man_actions[MAN_MAX] = {
        { NULL }, /* B */
        { NULL }, /* I */
        { NULL }, /* IR */
+       { NULL }, /* RI */
+       { NULL }, /* na */
+       { NULL }, /* i */
+       { NULL }, /* sp */
+       { NULL }, /* nf */
+       { NULL }, /* fi */
+       { NULL }, /* r*/
 };
 
 
@@ -109,7 +112,7 @@ 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_nerr(m, n, WNMEM));
 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 
@@ -120,33 +123,30 @@ post_TH(struct man *m)
        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 (n && (n = n->next))
                if (NULL == (m->meta.source = strdup(n->string)))
-                       return(man_verr(m, n->line, n->pos, "malloc"));
+                       return(man_nerr(m, n, WNMEM));
 
        /* 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_nerr(m, n, WNMEM));
 
        /* 
         * The end document shouldn't have the prologue macros as part
@@ -154,12 +154,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;
@@ -179,7 +177,7 @@ man_atotime(const char *p)
        struct tm        tm;
        char            *pp;
 
-       (void)memset(&tm, 0, sizeof(struct tm));
+       bzero(&tm, sizeof(struct tm));
 
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
                return(mktime(&tm));