Fixed email address in manual AUTHOR reference.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index eab8e40042a0e5fe6871498661436170fb4011f6..56b0721c270420eba3d5e9b8d3cfa9376f4dcb2c 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,24 +1,21 @@
-/* $Id: man.c,v 1.11 2009/03/26 14:38:11 kristaps Exp $ */
+/*     $Id: man.c,v 1.19 2009/06/10 20:18:43 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 <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -32,18 +29,19 @@ const       char *const __man_macronames[MAN_MAX] = {
        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",
-       "RI"
+       "RI",           "br",           "na",           "i"
        };
 
 const  char * const *man_macronames = __man_macronames;
 
-static struct man_node *man_node_alloc(int, int, enum man_type);
+static struct man_node *man_node_alloc(int, int, 
+                               enum man_type, int);
 static int              man_node_append(struct man *, 
                                struct man_node *);
 static int              man_ptext(struct man *, int, char *);
 static int              man_pmacro(struct man *, int, char *);
 static void             man_free1(struct man *);
-static void             man_alloc1(struct man *);
+static int              man_alloc1(struct man *);
 
 
 const struct man_node *
@@ -62,12 +60,12 @@ man_meta(const struct man *m)
 }
 
 
-void
+int
 man_reset(struct man *man)
 {
 
        man_free1(man);
-       man_alloc1(man);
+       return(man_alloc1(man));
 }
 
 
@@ -88,19 +86,22 @@ man_alloc(void *data, int pflags, const struct man_cb *cb)
 {
        struct man      *p;
 
-       p = calloc(1, sizeof(struct man));
-       if (NULL == p)
-               err(1, "calloc");
-
-       man_alloc1(p);
+       if (NULL == (p = calloc(1, sizeof(struct man))))
+               return(NULL);
 
-       if (cb)
-               (void)memcpy(&p->cb, cb, sizeof(struct man_cb));
+       if ( ! man_alloc1(p)) {
+               free(p);
+               return(NULL);
+       }
 
-       p->htab = man_hash_alloc();
        p->data = data;
        p->pflags = pflags;
+       (void)memcpy(&p->cb, cb, sizeof(struct man_cb));
 
+       if (NULL == (p->htab = man_hash_alloc())) {
+               free(p);
+               return(NULL);
+       }
        return(p);
 }
 
@@ -143,7 +144,7 @@ man_free1(struct man *man)
 }
 
 
-static void
+static int
 man_alloc1(struct man *m)
 {
 
@@ -151,10 +152,11 @@ man_alloc1(struct man *m)
        m->flags = 0;
        m->last = calloc(1, sizeof(struct man_node));
        if (NULL == m->last)
-               err(1, "calloc");
+               return(0);
        m->first = m->last;
        m->last->type = MAN_ROOT;
        m->next = MAN_NEXT_CHILD;
+       return(1);
 }
 
 
@@ -199,16 +201,18 @@ man_node_append(struct man *man, struct man_node *p)
 
 
 static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type)
+man_node_alloc(int line, int pos, enum man_type type, int tok)
 {
        struct man_node *p;
 
-       if (NULL == (p = calloc(1, sizeof(struct man_node))))
-               err(1, "malloc");
+       p = calloc(1, sizeof(struct man_node));
+       if (NULL == p)
+               return(NULL);
+
        p->line = line;
        p->pos = pos;
        p->type = type;
-
+       p->tok = tok;
        return(p);
 }
 
@@ -218,9 +222,9 @@ man_elem_alloc(struct man *man, int line, int pos, int tok)
 {
        struct man_node *p;
 
-       p = man_node_alloc(line, pos, MAN_ELEM);
-       p->tok = tok;
-
+       p = man_node_alloc(line, pos, MAN_ELEM, tok);
+       if (NULL == p)
+               return(0);
        return(man_node_append(man, p));
 }
 
@@ -231,10 +235,11 @@ man_word_alloc(struct man *man,
 {
        struct man_node *p;
 
-       p = man_node_alloc(line, pos, MAN_TEXT);
+       p = man_node_alloc(line, pos, MAN_TEXT, -1);
+       if (NULL == p)
+               return(0);
        if (NULL == (p->string = strdup(word)))
-               err(1, "strdup");
-
+               return(0);
        return(man_node_append(man, p));
 }
 
@@ -343,7 +348,7 @@ man_pmacro(struct man *m, int ln, char *buf)
                if ( ! man_vwarn(m, ln, ppos, 
                                "ill-formed macro: %s", mac))
                        goto err;
-               goto out;
+               return(1);
        }
        
        if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
@@ -355,7 +360,7 @@ man_pmacro(struct man *m, int ln, char *buf)
                if ( ! man_vwarn(m, ln, ppos, 
                                "unknown macro: %s", mac))
                        goto err;
-               goto out;
+               return(1);
        }
 
        /* The macro is sane.  Jump to the next word. */
@@ -372,7 +377,7 @@ out:
        if (fl) {
                /*
                 * A NLINE macro has been immediately followed with
-                * another.  Close out the preceeding macro's scope, and
+                * another.  Close out the preceding macro's scope, and
                 * continue.
                 */
                assert(MAN_ROOT != m->last->type);