Hooked up -Tascii to a2roffdeco backend.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 8fcb8ef93f180c2704de10da5bfcae6c2f9fe2a8..f6d53e3d913a94310adf7738d76940fae92927e7 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.37 2009/08/21 13:45:33 kristaps Exp $ */
+/*     $Id: man.c,v 1.46 2009/11/02 08:40:31 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include <sys/types.h>
+

 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>


@@ -22,10 +24,10 @@
 #include <string.h>
 
 #include "libman.h"
 #include <string.h>
 
 #include "libman.h"

+#include "libmandoc.h"

 
 const  char *const __man_merrnames[WERRMAX] = {                 
        "invalid character", /* WNPRINT */
 
 const  char *const __man_merrnames[WERRMAX] = {                 
        "invalid character", /* WNPRINT */

-       "system: malloc error", /* WNMEM */

        "invalid manual section", /* WMSEC */
        "invalid date format", /* WDATE */
        "scope of prior line violated", /* WLNSCOPE */
        "invalid manual section", /* WMSEC */
        "invalid date format", /* WDATE */
        "scope of prior line violated", /* WLNSCOPE */


@@ -38,7 +40,6 @@ const char *const __man_merrnames[WERRMAX] = {
        "expected block head arguments", /* WHEADARGS */
        "expected block body arguments", /* WBODYARGS */
        "expected empty block head", /* WNHEADARGS */
        "expected block head arguments", /* WHEADARGS */
        "expected block body arguments", /* WBODYARGS */
        "expected empty block head", /* WNHEADARGS */

-       "unknown macro", /* WMACRO */

        "ill-formed macro", /* WMACROFORM */
        "scope open on exit", /* WEXITSCOPE */
        "no scope context", /* WNOSCOPE */
        "ill-formed macro", /* WMACROFORM */
        "scope open on exit", /* WEXITSCOPE */
        "no scope context", /* WNOSCOPE */


@@ -54,7 +55,7 @@ const char *const __man_macronames[MAN_MAX] = {
        "R",            "B",            "I",            "IR",
        "RI",           "na",           "i",            "sp",
        "nf",           "fi",           "r",            "RE",
        "R",            "B",            "I",            "IR",
        "RI",           "na",           "i",            "sp",
        "nf",           "fi",           "r",            "RE",

-       "RS",           "DT"
+       "RS",           "DT",           "UC",           "PD"

        };
 
 const  char * const *man_macronames = __man_macronames;
        };
 
 const  char * const *man_macronames = __man_macronames;


@@ -66,9 +67,10 @@ static       int              man_node_append(struct man *,
 static int              man_ptext(struct man *, int, char *);
 static int              man_pmacro(struct man *, int, char *);
 static void             man_free1(struct man *);
 static int              man_ptext(struct man *, int, char *);
 static int              man_pmacro(struct man *, int, char *);
 static void             man_free1(struct man *);

-static int              man_alloc1(struct man *);
+static void             man_alloc1(struct man *);

 static int              pstring(struct man *, int, int, 
                                const char *, size_t);
 static int              pstring(struct man *, int, int, 
                                const char *, size_t);

+static int              macrowarn(struct man *, int, const char *);

 
 #ifdef __linux__
 extern size_t            strlcpy(char *, const char *, size_t);
 
 #ifdef __linux__
 extern size_t            strlcpy(char *, const char *, size_t);


@@ -91,12 +93,12 @@ man_meta(const struct man *m)
 }
 
 
 }
 
 

-int
+void

 man_reset(struct man *man)
 {
 
        man_free1(man);
 man_reset(struct man *man)
 {
 
        man_free1(man);

-       return(man_alloc1(man));
+       man_alloc1(man);

 }
 
 
 }
 
 


@@ -105,9 +107,6 @@ man_free(struct man *man)
 {
 
        man_free1(man);
 {
 
        man_free1(man);

-
-       if (man->htab)
-               man_hash_free(man->htab);

        free(man);
 }
 
        free(man);
 }
 


@@ -117,22 +116,16 @@ man_alloc(void *data, int pflags, const struct man_cb *cb)
 {
        struct man      *p;
 
 {
        struct man      *p;
 

-       if (NULL == (p = calloc(1, sizeof(struct man))))
-               return(NULL);
+       p = mandoc_calloc(1, sizeof(struct man));

 
 

-       if ( ! man_alloc1(p)) {
-               free(p);
-               return(NULL);
-       }
+       if (cb)
+               memcpy(&p->cb, cb, sizeof(struct man_cb));

 
 

+       man_hash_init();

        p->data = data;
        p->pflags = pflags;
        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);
-       }
+       man_alloc1(p);

        return(p);
 }
 
        return(p);
 }
 


@@ -175,19 +168,16 @@ man_free1(struct man *man)
 }
 
 
 }
 
 

-static int
+static void

 man_alloc1(struct man *m)
 {
 
 man_alloc1(struct man *m)
 {
 

-       bzero(&m->meta, sizeof(struct man_meta));
+       memset(&m->meta, 0, sizeof(struct man_meta));

        m->flags = 0;
        m->flags = 0;

-       m->last = calloc(1, sizeof(struct man_node));
-       if (NULL == m->last)
-               return(0);
+       m->last = mandoc_calloc(1, sizeof(struct man_node));

        m->first = m->last;
        m->last->type = MAN_ROOT;
        m->next = MAN_NEXT_CHILD;
        m->first = m->last;
        m->last->type = MAN_ROOT;
        m->next = MAN_NEXT_CHILD;

-       return(1);

 }
 
 
 }
 
 


@@ -254,10 +244,7 @@ man_node_alloc(int line, int pos, enum man_type type, int tok)
 {
        struct man_node *p;
 
 {
        struct man_node *p;
 

-       p = calloc(1, sizeof(struct man_node));
-       if (NULL == p)
-               return(NULL);
-
+       p = mandoc_calloc(1, sizeof(struct man_node));

        p->line = line;
        p->pos = pos;
        p->type = type;
        p->line = line;
        p->pos = pos;
        p->type = type;


@@ -272,8 +259,6 @@ man_elem_alloc(struct man *m, int line, int pos, int tok)
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_ELEM, tok);
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_ELEM, tok);

-       if (NULL == p)
-               return(0);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -287,8 +272,6 @@ man_head_alloc(struct man *m, int line, int pos, int tok)
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_HEAD, tok);
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_HEAD, tok);

-       if (NULL == p)
-               return(0);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -302,8 +285,6 @@ man_body_alloc(struct man *m, int line, int pos, int tok)
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_BODY, tok);
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_BODY, tok);

-       if (NULL == p)
-               return(0);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -317,8 +298,6 @@ man_block_alloc(struct man *m, int line, int pos, int tok)
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_BLOCK, tok);
        struct man_node *p;
 
        p = man_node_alloc(line, pos, MAN_BLOCK, tok);

-       if (NULL == p)
-               return(0);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -334,15 +313,7 @@ pstring(struct man *m, int line, int pos,
        size_t           sv;
 
        n = man_node_alloc(line, pos, MAN_TEXT, -1);
        size_t           sv;
 
        n = man_node_alloc(line, pos, MAN_TEXT, -1);

-       if (NULL == n)
-               return(0);
-
-       n->string = malloc(len + 1);
-       if (NULL == n->string) {
-               free(n);
-               return(0);
-       }
-
+       n->string = mandoc_malloc(len + 1);

        sv = strlcpy(n->string, p, len + 1);
 
        /* Prohibit truncation. */
        sv = strlcpy(n->string, p, len + 1);
 
        /* Prohibit truncation. */


@@ -460,6 +431,18 @@ descope:
 }
 
 
 }
 
 

+static int
+macrowarn(struct man *m, int ln, const char *buf)
+{
+       if ( ! (MAN_IGN_MACRO & m->pflags))
+               return(man_verr(m, ln, 0, 
+                               "unknown macro: %s%s", 
+                               buf, strlen(buf) > 3 ? "..." : ""));
+       return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
+                               buf, strlen(buf) > 3 ? "..." : ""));
+}
+
+

 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {


@@ -471,8 +454,8 @@ man_pmacro(struct man *m, int ln, char *buf)
 
        fl = m->flags;
 
 
        fl = m->flags;
 

-       if (0 == buf[1])
-               goto out;
+       if ('\0' == buf[1])
+               return(1);

 
        i = 1;
 
 
        i = 1;
 


@@ -493,9 +476,15 @@ man_pmacro(struct man *m, int ln, char *buf)
                        break;
                else if (' ' == buf[i])
                        break;
                        break;
                else if (' ' == buf[i])
                        break;

+
+               /* Check for invalid characters. */
+
+               if (isgraph((u_char)buf[i]))
+                       continue;
+               return(man_perr(m, ln, i, WNPRINT));

        }
 
        }
 

-       mac[j] = 0;
+       mac[j] = '\0';

 
        if (j == 4 || j < 1) {
                if ( ! (MAN_IGN_MACRO & m->pflags)) {
 
        if (j == 4 || j < 1) {
                if ( ! (MAN_IGN_MACRO & m->pflags)) {


@@ -507,12 +496,8 @@ man_pmacro(struct man *m, int ln, char *buf)
                return(1);
        }
        
                return(1);
        }
        

-       if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
-               if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_perr(m, ln, ppos, WMACRO);
-                       goto err;
-               } 
-               if ( ! man_pwarn(m, ln, ppos, WMACRO))
+       if (MAN_MAX == (c = man_hash_find(mac))) {
+               if ( ! macrowarn(m, ln, mac))

                        goto err;
                return(1);
        }
                        goto err;
                return(1);
        }