Keep words after .Ic together in a single argument.

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 4dcd52900eb8289edceb7d574df75e22f28119f1..e796385948ed1dbea8558290f6aa7c900c3135b8 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.103 2014/01/06 03:02:46 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))


@@ -130,7 +133,7 @@ struct      mdoc_handler {
 };
 
 static void     dbclose(int);
 };
 
 static void     dbclose(int);

-static void     dbindex(const struct mpage *, struct mchars *);
+static void     dbadd(const struct mpage *, struct mchars *);

 static int      dbopen(int);
 static void     dbprune(void);
 static void     filescan(const char *);
 static int      dbopen(int);
 static void     dbprune(void);
 static void     filescan(const char *);


@@ -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 *,


@@ -700,11 +702,19 @@ filescan(const char *file)
                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, NULL);
                return;
                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, NULL);
                return;

-       } else if (OP_TEST != op && strstr(buf, basedir) != buf) {
+       }
+
+       if (strstr(buf, basedir) == buf)
+               start = buf + strlen(basedir) + 1;
+       else if (OP_TEST == op)
+               start = buf;
+       else {

                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
                return;
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
                return;

-       } else if (-1 == stat(buf, &st)) {
+       }
+
+       if (-1 == stat(buf, &st)) {

                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, NULL);
                return;
                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, NULL);
                return;


@@ -713,7 +723,7 @@ filescan(const char *file)
                say(file, "Not a regular file");
                return;
        }
                say(file, "Not a regular file");
                return;
        }

-       start = buf + strlen(basedir);
+

        mlink = mandoc_calloc(1, sizeof(struct mlink));
        strlcpy(mlink->file, start, sizeof(mlink->file));
 
        mlink = mandoc_calloc(1, sizeof(struct mlink));
        strlcpy(mlink->file, start, sizeof(mlink->file));
 


@@ -946,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;


@@ -961,6 +972,9 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
        str_info.hfree = hash_free;
        str_info.key_offset = offsetof(struct str, key);
 
        str_info.hfree = hash_free;
        str_info.key_offset = offsetof(struct str, key);
 

+       if (0 == nodb)
+               SQL_EXEC("BEGIN TRANSACTION");
+

        mpage = ohash_first(&mpages, &pslot);
        while (NULL != mpage) {
                mlinks_undupe(mpage);
        mpage = ohash_first(&mpages, &pslot);
        while (NULL != mpage) {
                mlinks_undupe(mpage);


@@ -1014,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)


@@ -1022,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);
                }
 


@@ -1047,10 +1061,13 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                else
                        parse_cat(mpage);
 
                else
                        parse_cat(mpage);
 

-               dbindex(mpage, mc);
+               dbadd(mpage, mc);

                ohash_delete(&strings);
                mpage = ohash_next(&mpages, &pslot);
        }
                ohash_delete(&strings);
                mpage = ohash_next(&mpages, &pslot);
        }

+
+       if (0 == nodb)
+               SQL_EXEC("END TRANSACTION");

 }
 
 static void
 }
 
 static void


@@ -1169,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);
 }
 


@@ -1288,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) {


@@ -1417,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);


@@ -1539,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);


@@ -1732,7 +1775,7 @@ render_key(struct mchars *mc, struct str *key)
  * Also, handle escape sequences at the last possible moment.
  */
 static void
  * Also, handle escape sequences at the last possible moment.
  */
 static void

-dbindex(const struct mpage *mpage, struct mchars *mc)
+dbadd(const struct mpage *mpage, struct mchars *mc)

 {
        struct mlink    *mlink;
        struct str      *key;
 {
        struct mlink    *mlink;
        struct str      *key;


@@ -1741,13 +1784,11 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
        unsigned int     slot;
 
        if (verb)
        unsigned int     slot;
 
        if (verb)

-               say(mpage->mlinks->file, "Adding to index");
+               say(mpage->mlinks->file, "Adding to database");

 
        if (nodb)
                return;
 
 
        if (nodb)
                return;
 

-       SQL_EXEC("BEGIN TRANSACTION");
-

        i = 1;
        SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);
        i = 1;
        SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);


@@ -1756,7 +1797,6 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 
        for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
                i = 1;
 
        for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
                i = 1;

-               SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);

                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);
                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
                SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);


@@ -1780,8 +1820,6 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
                        free(key->rendered);
                free(key);
        }
                        free(key->rendered);
                free(key);
        }

-
-       SQL_EXEC("END TRANSACTION");

 }
 
 static void
 }
 
 static void


@@ -1792,20 +1830,31 @@ dbprune(void)
        size_t           i;
        unsigned int     slot;
 
        size_t           i;
        unsigned int     slot;
 

-       if (nodb)
-               return;
+       if (0 == nodb)
+               SQL_EXEC("BEGIN TRANSACTION");

 
 

-       mpage = ohash_first(&mpages, &slot);
-       while (NULL != mpage) {
+       for (mpage = ohash_first(&mpages, &slot); NULL != mpage;
+            mpage = ohash_next(&mpages, &slot)) {

                mlink = mpage->mlinks;
                mlink = mpage->mlinks;

-               i = 1;
-               SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file);
-               SQL_STEP(stmts[STMT_DELETE_PAGE]);
-               sqlite3_reset(stmts[STMT_DELETE_PAGE]);

                if (verb)
                if (verb)

-                       say(mlink->file, "Deleted from index");
-               mpage = ohash_next(&mpages, &slot);
+                       say(mlink->file, "Deleting from database");
+               if (nodb)
+                       continue;
+               for ( ; NULL != mlink; mlink = mlink->next) {
+                       i = 1;
+                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+                           i, mlink->dsec);
+                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+                           i, mlink->arch);
+                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
+                           i, mlink->name);
+                       SQL_STEP(stmts[STMT_DELETE_PAGE]);
+                       sqlite3_reset(stmts[STMT_DELETE_PAGE]);
+               }

        }
        }

+
+       if (0 == nodb)
+               SQL_EXEC("END TRANSACTION");

 }
 
 /*
 }
 
 /*


@@ -1890,24 +1939,19 @@ dbopen(int real)
              ");\n"
              "\n"
              "CREATE TABLE \"mlinks\" (\n"
              ");\n"
              "\n"
              "CREATE TABLE \"mlinks\" (\n"

-             " \"file\" TEXT NOT NULL,\n"

              " \"sec\" TEXT NOT NULL,\n"
              " \"arch\" TEXT NOT NULL,\n"
              " \"name\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
              " \"sec\" TEXT NOT NULL,\n"
              " \"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"
-             ");\n"
-             "\n"
-             "CREATE INDEX \"key_index\" ON keys (key);\n";
+               "ON DELETE CASCADE\n"
+             ");\n";

 
        if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
 
        if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;


@@ -1917,13 +1961,15 @@ dbopen(int real)
 
 prepare_statements:
        SQL_EXEC("PRAGMA foreign_keys = ON");
 
 prepare_statements:
        SQL_EXEC("PRAGMA foreign_keys = ON");

-       sql = "DELETE FROM mpages where file=?";
+       sql = "DELETE FROM mpages WHERE id IN "
+               "(SELECT pageid FROM mlinks WHERE "
+               "sec=? AND arch=? AND name=?)";

        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
        sql = "INSERT INTO mpages "
                "(form) VALUES (?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
        sql = "INSERT INTO mlinks "
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
        sql = "INSERT INTO mpages "
                "(form) VALUES (?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
        sql = "INSERT INTO mlinks "

-               "(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";
+               "(sec,arch,name,pageid) VALUES (?,?,?,?)";

        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
        sql = "INSERT INTO keys "
                "(bits,key,pageid) VALUES (?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
        sql = "INSERT INTO keys "
                "(bits,key,pageid) VALUES (?,?,?)";