mandoc.1 reflects actual use of -f option (schwarze@openbsd.org)

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index fb29115a3785f815aff022cd51203764cea489da..df9cb5f0af50859f9e3e422ebdac7b643d91dc8b 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,27 +1,23 @@
-/* $Id: man_action.c,v 1.3 2009/03/25 16:08:30 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.12 2009/06/16 19:55:28 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,9 @@ const struct actions man_actions[MAN_MAX] = {
        { NULL }, /* B */
        { NULL }, /* I */
        { NULL }, /* IR */
+       { NULL }, /* RI */
+       { NULL }, /* na */
+       { NULL }, /* i */
 };
 
 
@@ -109,7 +108,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 +125,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,27 +135,37 @@ 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
         * 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) {
+               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;
+               n = m->last;
+               m->last = m->last->prev;
+               m->next = MAN_NEXT_SIBLING;
+       }
 
        man_node_freelist(n);
        return(1);