Keep words after .Ic together in a single argument.

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index f24862d7f88e9e657a5211d856cd8d7d2ae4adae..e796385948ed1dbea8558290f6aa7c900c3135b8 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.108 2014/01/18 08:19:18 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.113 2014/01/19 22:48:16 schwarze Exp $ */

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


@@ -48,6 +48,9 @@
 #include "manpath.h"
 #include "mansearch.h"
 
 #include "manpath.h"
 #include "mansearch.h"
 

+extern int mansearch_keymax;
+extern const char *const mansearch_keynames[];
+

 #define        SQL_EXEC(_v) \
        if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \
                fprintf(stderr, "%s\n", sqlite3_errmsg(db))
 #define        SQL_EXEC(_v) \
        if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \
                fprintf(stderr, "%s\n", sqlite3_errmsg(db))


@@ -154,8 +157,7 @@ static      int      parse_mdoc_Nd(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Nm(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Sh(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Xr(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Nm(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Sh(struct mpage *, const struct mdoc_node *);
 static int      parse_mdoc_Xr(struct mpage *, const struct mdoc_node *);

-static void     putkey(const struct mpage *,
-                       const char *, uint64_t);
+static void     putkey(const struct mpage *, char *, uint64_t);

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


@@ -954,12 +956,13 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
 static void
 mpages_merge(struct mchars *mc, struct mparse *mp)
 {
 static void
 mpages_merge(struct mchars *mc, struct mparse *mp)
 {

+       char                     any[] = "any";

        struct ohash_info        str_info;
        struct mpage            *mpage;
        struct mlink            *mlink;
        struct mdoc             *mdoc;
        struct man              *man;
        struct ohash_info        str_info;
        struct mpage            *mpage;
        struct mlink            *mlink;
        struct mdoc             *mdoc;
        struct man              *man;

-       const char              *cp;
+       char                    *cp;

        int                      match;
        unsigned int             pslot;
        enum mandoclevel         lvl;
        int                      match;
        unsigned int             pslot;
        enum mandoclevel         lvl;


@@ -1025,7 +1028,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                }
                putkey(mpage, mpage->sec, TYPE_sec);
                putkey(mpage, '\0' == *mpage->arch ?
                }
                putkey(mpage, mpage->sec, TYPE_sec);
                putkey(mpage, '\0' == *mpage->arch ?

-                   "any" : mpage->arch, TYPE_arch);
+                   any : mpage->arch, TYPE_arch);

 
                for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
                        if ('\0' != *mlink->dsec)
 
                for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
                        if ('\0' != *mlink->dsec)


@@ -1033,7 +1036,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                        if ('\0' != *mlink->fsec)
                                putkey(mpage, mlink->fsec, TYPE_sec);
                        putkey(mpage, '\0' == *mlink->arch ?
                        if ('\0' != *mlink->fsec)
                                putkey(mpage, mlink->fsec, TYPE_sec);
                        putkey(mpage, '\0' == *mlink->arch ?

-                           "any" : mlink->arch, TYPE_arch);
+                           any : mlink->arch, TYPE_arch);

                        putkey(mpage, mlink->name, TYPE_Nm);
                }
 
                        putkey(mpage, mlink->name, TYPE_Nm);
                }
 


@@ -1183,10 +1186,15 @@ parse_cat(struct mpage *mpage)
  * Put a type/word pair into the word database for this particular file.
  */
 static void
  * Put a type/word pair into the word database for this particular file.
  */
 static void

-putkey(const struct mpage *mpage, const char *value, uint64_t type)
+putkey(const struct mpage *mpage, char *value, uint64_t type)

 {
 {

+       char     *cp;

 
        assert(NULL != value);
 
        assert(NULL != value);

+       if (TYPE_arch == type)
+               for (cp = value; *cp; cp++)
+                       if (isupper((unsigned char)*cp))
+                               *cp = _tolower((unsigned char)*cp);

        putkeys(mpage, value, strlen(value), type);
 }
 
        putkeys(mpage, value, strlen(value), type);
 }
 


@@ -1302,6 +1310,15 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                                byte = start[sz];
                                start[sz] = '\0';
 
                                byte = start[sz];
                                start[sz] = '\0';
 

+                               /*
+                                * Assume a stray trailing comma in the
+                                * name list if a name begins with a dash.
+                                */
+
+                               if ('-' == start[0] ||
+                                   ('\\' == start[0] && '-' == start[1]))
+                                       break;
+

                                putkey(mpage, start, TYPE_Nm);
 
                                if (' ' == byte) {
                                putkey(mpage, start, TYPE_Nm);
 
                                if (' ' == byte) {


@@ -1431,7 +1448,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
 static int
 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n)
 {
 static int
 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n)
 {

-       const char      *cp;
+       char    *cp;

 
        if (NULL == (n = n->child) || MDOC_TEXT != n->type)
                return(0);
 
        if (NULL == (n = n->child) || MDOC_TEXT != n->type)
                return(0);


@@ -1553,12 +1570,24 @@ putkeys(const struct mpage *mpage,
        const char *cp, size_t sz, uint64_t v)
 {
        struct str      *s;
        const char *cp, size_t sz, uint64_t v)
 {
        struct str      *s;

-       unsigned int     slot;

        const char      *end;
        const char      *end;

+       uint64_t         mask;
+       unsigned int     slot;
+       int              i;

 
        if (0 == sz)
                return;
 
 
        if (0 == sz)
                return;
 

+       if (verb > 1) {
+               for (i = 0, mask = 1;
+                    i < mansearch_keymax;
+                    i++, mask <<= 1)
+                       if (mask & v)
+                               break;
+               say(mpage->mlinks->file, "Adding key %s=%*s",
+                   mansearch_keynames[i], sz, cp);
+       }
+

        end = cp + sz;
        slot = ohash_qlookupi(&strings, cp, &end);
        s = ohash_find(&strings, slot);
        end = cp + sz;
        slot = ohash_qlookupi(&strings, cp, &end);
        s = ohash_find(&strings, slot);


@@ -1914,16 +1943,14 @@ dbopen(int real)
              " \"arch\" TEXT NOT NULL,\n"
              " \"name\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
              " \"arch\" TEXT NOT NULL,\n"
              " \"name\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "

-               "ON DELETE CASCADE,\n"
-             " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+               "ON DELETE CASCADE\n"

              ");\n"
              "\n"
              "CREATE TABLE \"keys\" (\n"
              " \"bits\" INTEGER NOT NULL,\n"
              " \"key\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
              ");\n"
              "\n"
              "CREATE TABLE \"keys\" (\n"
              " \"bits\" INTEGER NOT NULL,\n"
              " \"key\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "

-               "ON DELETE CASCADE,\n"
-             " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+               "ON DELETE CASCADE\n"

              ");\n";
 
        if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
              ");\n";
 
        if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {