Replace the structs mdoc and man by a unified struct roff_man.

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index a0b8775093795450a581ec3f510795e6e30b3660..03f6ab20590ed5cfc9dfbc5a967a26395e8da2ef 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.187 2015/03/27 17:37:25 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.191 2015/04/18 16:06:40 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -46,10 +46,11 @@
 #endif
 #include <sqlite3.h>
 
 #endif
 #include <sqlite3.h>
 

+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"

 #include "mdoc.h"
 #include "man.h"
 #include "mdoc.h"
 #include "man.h"

-#include "mandoc.h"
-#include "mandoc_aux.h"

 #include "manconf.h"
 #include "mansearch.h"
 
 #include "manconf.h"
 #include "mansearch.h"
 


@@ -129,8 +130,8 @@ enum        stmt {
        STMT__MAX
 };
 
        STMT__MAX
 };
 

-typedef        int (*mdoc_fp)(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
+typedef        int (*mdoc_fp)(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);

 
 struct mdoc_handler {
        mdoc_fp          fp; /* optional handler */
 
 struct mdoc_handler {
        mdoc_fp          fp; /* optional handler */


@@ -155,33 +156,33 @@ static    void     mpages_free(void);
 static void     mpages_merge(struct mparse *);
 static void     names_check(void);
 static void     parse_cat(struct mpage *, int);
 static void     mpages_merge(struct mparse *);
 static void     names_check(void);
 static void     parse_cat(struct mpage *, int);

-static void     parse_man(struct mpage *, const struct man_meta *,
-                       const struct man_node *);
-static void     parse_mdoc(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_body(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_head(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Fd(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static void     parse_mdoc_fname(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Fn(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Fo(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Nd(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Nm(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Sh(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
-static int      parse_mdoc_Xr(struct mpage *, const struct mdoc_meta *,
-                       const struct mdoc_node *);
+static void     parse_man(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static void     parse_mdoc(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_body(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_head(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static void     parse_mdoc_fname(struct mpage *, const struct roff_node *);
+static int      parse_mdoc_Fn(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Fo(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Nd(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Nm(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Sh(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Xr(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);

 static void     putkey(const struct mpage *, char *, uint64_t);
 static void     putkeys(const struct mpage *, char *, size_t, uint64_t);
 static void     putmdockey(const struct mpage *,
 static void     putkey(const struct mpage *, char *, uint64_t);
 static void     putkeys(const struct mpage *, char *, size_t, uint64_t);
 static void     putmdockey(const struct mpage *,

-                       const struct mdoc_node *, uint64_t);
+                       const struct roff_node *, uint64_t);

 static int      render_string(char **, size_t *);
 static void     say(const char *, const char *, ...);
 static int      set_basedir(const char *, int);
 static int      render_string(char **, size_t *);
 static void     say(const char *, const char *, ...);
 static int      set_basedir(const char *, int);


@@ -1106,8 +1107,8 @@ mpages_merge(struct mparse *mp)
        struct ohash_info        str_info;
        struct mpage            *mpage, *mpage_dest;
        struct mlink            *mlink, *mlink_dest;
        struct ohash_info        str_info;
        struct mpage            *mpage, *mpage_dest;
        struct mlink            *mlink, *mlink_dest;

-       struct mdoc             *mdoc;
-       struct man              *man;
+       struct roff_man         *mdoc;
+       struct roff_man         *man;

        char                    *sodest;
        char                    *cp;
        int                      fd;
        char                    *sodest;
        char                    *cp;
        int                      fd;


@@ -1430,22 +1431,22 @@ putkey(const struct mpage *mpage, char *value, uint64_t type)
  */
 static void
 putmdockey(const struct mpage *mpage,
  */
 static void
 putmdockey(const struct mpage *mpage,

-       const struct mdoc_node *n, uint64_t m)
+       const struct roff_node *n, uint64_t m)

 {
 
        for ( ; NULL != n; n = n->next) {
                if (NULL != n->child)
                        putmdockey(mpage, n->child, m);
 {
 
        for ( ; NULL != n; n = n->next) {
                if (NULL != n->child)
                        putmdockey(mpage, n->child, m);

-               if (MDOC_TEXT == n->type)
+               if (n->type == ROFFT_TEXT)

                        putkey(mpage, n->string, m);
        }
 }
 
 static void
                        putkey(mpage, n->string, m);
        }
 }
 
 static void

-parse_man(struct mpage *mpage, const struct man_meta *meta,
-       const struct man_node *n)
+parse_man(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 {

-       const struct man_node *head, *body;
+       const struct roff_node *head, *body;

        char            *start, *title;
        char             byte;
        size_t           sz;
        char            *start, *title;
        char             byte;
        size_t           sz;


@@ -1460,13 +1461,13 @@ parse_man(struct mpage *mpage, const struct man_meta *meta,
         * the correct section or not.
         */
 
         * the correct section or not.
         */
 

-       if (MAN_BODY == n->type && MAN_SH == n->tok) {
+       if (n->type == ROFFT_BODY && n->tok == MAN_SH) {

                body = n;
                assert(body->parent);
                if (NULL != (head = body->parent->head) &&
                    1 == head->nchild &&
                    NULL != (head = (head->child)) &&
                body = n;
                assert(body->parent);
                if (NULL != (head = body->parent->head) &&
                    1 == head->nchild &&
                    NULL != (head = (head->child)) &&

-                   MAN_TEXT == head->type &&
+                   head->type == ROFFT_TEXT &&

                    0 == strcmp(head->string, "NAME") &&
                    NULL != body->child) {
 
                    0 == strcmp(head->string, "NAME") &&
                    NULL != body->child) {
 


@@ -1568,22 +1569,22 @@ parse_man(struct mpage *mpage, const struct man_meta *meta,
 }
 
 static void
 }
 
 static void

-parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
        assert(NULL != n);
        for (n = n->child; NULL != n; n = n->next) {
                switch (n->type) {
 {
 
        assert(NULL != n);
        for (n = n->child; NULL != n; n = n->next) {
                switch (n->type) {

-               case MDOC_ELEM:
+               case ROFFT_ELEM:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case MDOC_BLOCK:
+               case ROFFT_BLOCK:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case MDOC_HEAD:
+               case ROFFT_HEAD:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case MDOC_BODY:
+               case ROFFT_BODY:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case MDOC_TAIL:
+               case ROFFT_TAIL:

                        if (NULL != mdocs[n->tok].fp)
                               if (0 == (*mdocs[n->tok].fp)(mpage, meta, n))
                                       break;
                        if (NULL != mdocs[n->tok].fp)
                               if (0 == (*mdocs[n->tok].fp)(mpage, meta, n))
                                       break;


@@ -1592,7 +1593,7 @@ parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
                                    mdocs[n->tok].mask);
                        break;
                default:
                                    mdocs[n->tok].mask);
                        break;
                default:

-                       assert(MDOC_ROOT != n->type);
+                       assert(n->type != ROFFT_ROOT);

                        continue;
                }
                if (NULL != n->child)
                        continue;
                }
                if (NULL != n->child)


@@ -1601,15 +1602,15 @@ parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
 }
 
 static int

-parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
        char            *start, *end;
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||
            NULL == (n = n->child) ||
 {
        char            *start, *end;
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||
            NULL == (n = n->child) ||

-           MDOC_TEXT != n->type)
+           n->type != ROFFT_TEXT)

                return(0);
 
        /*
                return(0);
 
        /*


@@ -1620,7 +1621,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
        if (strcmp("#include", n->string))
                return(0);
 
        if (strcmp("#include", n->string))
                return(0);
 

-       if (NULL == (n = n->next) || MDOC_TEXT != n->type)
+       if ((n = n->next) == NULL || n->type != ROFFT_TEXT)

                return(0);
 
        /*
                return(0);
 
        /*


@@ -1645,12 +1646,12 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static void
 }
 
 static void

-parse_mdoc_fname(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_fname(struct mpage *mpage, const struct roff_node *n)

 {
        char    *cp;
        size_t   sz;
 
 {
        char    *cp;
        size_t   sz;
 

-       if (n->type != MDOC_TEXT)
+       if (n->type != ROFFT_TEXT)

                return;
 
        /* Skip function pointer punctuation. */
                return;
 
        /* Skip function pointer punctuation. */


@@ -1666,8 +1667,8 @@ parse_mdoc_fname(struct mpage *mpage, const struct mdoc_node *n)
 }
 
 static int
 }
 
 static int

-parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
        if (n->child == NULL)
 {
 
        if (n->child == NULL)


@@ -1676,18 +1677,18 @@ parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
        parse_mdoc_fname(mpage, n->child);
 
        for (n = n->child->next; n != NULL; n = n->next)
        parse_mdoc_fname(mpage, n->child);
 
        for (n = n->child->next; n != NULL; n = n->next)

-               if (n->type == MDOC_TEXT)
+               if (n->type == ROFFT_TEXT)

                        putkey(mpage, n->string, TYPE_Fa);
 
        return(0);
 }
 
 static int
                        putkey(mpage, n->string, TYPE_Fa);
 
        return(0);
 }
 
 static int

-parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Fo(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
 {
 

-       if (n->type != MDOC_HEAD)
+       if (n->type != ROFFT_HEAD)

                return(1);
 
        if (n->child != NULL)
                return(1);
 
        if (n->child != NULL)


@@ -1697,8 +1698,8 @@ parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
 }
 
 static int

-parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Xr(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
        char    *cp;
 
 {
        char    *cp;
 


@@ -1717,23 +1718,23 @@ parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
 }
 
 static int

-parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Nd(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                mdoc_deroff(&mpage->desc, n);
        return(0);
 }
 
 static int
                mdoc_deroff(&mpage->desc, n);
        return(0);
 }
 
 static int

-parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Nm(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
        if (SEC_NAME == n->sec)
                putmdockey(mpage, n->child, NAME_TITLE);
 {
 
        if (SEC_NAME == n->sec)
                putmdockey(mpage, n->child, NAME_TITLE);

-       else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type) {
+       else if (n->sec == SEC_SYNOPSIS && n->type == ROFFT_HEAD) {

                if (n->child == NULL)
                        putkey(mpage, meta->name, NAME_SYN);
                else
                if (n->child == NULL)
                        putkey(mpage, meta->name, NAME_SYN);
                else


@@ -1742,34 +1743,34 @@ parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
        if ( ! (mpage->name_head_done ||
            n->child == NULL || n->child->string == NULL ||
            strcasecmp(n->child->string, meta->title))) {
        if ( ! (mpage->name_head_done ||
            n->child == NULL || n->child->string == NULL ||
            strcasecmp(n->child->string, meta->title))) {

-               putkey(mpage, n->child->string, NAME_HEAD);
+               putkey(mpage, n->child->string, ROFFT_HEAD);

                mpage->name_head_done = 1;
        }
        return(0);
 }
 
 static int
                mpage->name_head_done = 1;
        }
        return(0);
 }
 
 static int

-parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_Sh(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
 {
 

-       return(SEC_CUSTOM == n->sec && MDOC_HEAD == n->type);
+       return(n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD);

 }
 
 static int
 }
 
 static int

-parse_mdoc_head(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_head(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
 {
 

-       return(MDOC_HEAD == n->type);
+       return(n->type == ROFFT_HEAD);

 }
 
 static int
 }
 
 static int

-parse_mdoc_body(struct mpage *mpage, const struct mdoc_meta *meta,
-       const struct mdoc_node *n)
+parse_mdoc_body(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)

 {
 
 {
 

-       return(MDOC_BODY == n->type);
+       return(n->type == ROFFT_BODY);

 }
 
 /*
 }
 
 /*