correct the spacing after in-line equations

[mandoc.git] / mansearch.c

diff --git a/mansearch.c b/mansearch.c
index f9892218fb6f3da292eef02c37c34ac7e917f5ae..9c88fac8047c40a90fc876b393eeb46c75c7ddae 100644 (file)
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.c,v 1.36 2014/04/23 21:06:41 schwarze Exp $ */
+/*     $Id: mansearch.c,v 1.48 2014/09/03 18:09:14 schwarze Exp $ */

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


@@ -15,11 +15,11 @@
  * 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.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/mman.h>
 
 #include <sys/mman.h>

+#include <sys/types.h>
+

 #include <assert.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <getopt.h>


@@ -32,12 +32,15 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

-#ifdef HAVE_OHASH
+#if HAVE_OHASH

 #include <ohash.h>
 #else
 #include "compat_ohash.h"
 #endif
 #include <sqlite3.h>
 #include <ohash.h>
 #else
 #include "compat_ohash.h"
 #endif
 #include <sqlite3.h>

+#ifndef SQLITE_DETERMINISTIC
+#define SQLITE_DETERMINISTIC 0
+#endif

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


@@ -64,19 +67,20 @@ extern const char *const mansearch_keynames[];
        } while (0)
 
 struct expr {
        } while (0)
 
 struct expr {

-       uint64_t         bits;    /* type-mask */
-       const char      *substr;  /* to search for, if applicable */

        regex_t          regexp;  /* compiled regexp, if applicable */
        regex_t          regexp;  /* compiled regexp, if applicable */

+       const char      *substr;  /* to search for, if applicable */
+       struct expr     *next;    /* next in sequence */
+       uint64_t         bits;    /* type-mask */
+       int              equal;   /* equality, not subsring match */

        int              open;    /* opening parentheses before */
        int              and;     /* logical AND before */
        int              close;   /* closing parentheses after */
        int              open;    /* opening parentheses before */
        int              and;     /* logical AND before */
        int              close;   /* closing parentheses after */

-       struct expr     *next;    /* next in sequence */

 };
 
 struct match {
        uint64_t         pageid; /* identifier in database */
        char            *desc; /* manual page description */
 };
 
 struct match {
        uint64_t         pageid; /* identifier in database */
        char            *desc; /* manual page description */

-       int              form; /* 0 == catpage */
+       int              form; /* bit field: formatted, zipped? */

 };
 
 static void             buildnames(struct manpage *, sqlite3 *,
 };
 
 static void             buildnames(struct manpage *, sqlite3 *,


@@ -85,14 +89,15 @@ static      void             buildnames(struct manpage *, sqlite3 *,
 static char            *buildoutput(sqlite3 *, sqlite3_stmt *,
                                 uint64_t, uint64_t);
 static void            *hash_alloc(size_t, void *);
 static char            *buildoutput(sqlite3 *, sqlite3_stmt *,
                                 uint64_t, uint64_t);
 static void            *hash_alloc(size_t, void *);

-static void             hash_free(void *, size_t, void *);
-static void            *hash_halloc(size_t, void *);
+static void             hash_free(void *, void *);
+static void            *hash_calloc(size_t, size_t, void *);

 static struct expr     *exprcomp(const struct mansearch *,
                                int, char *[]);
 static void             exprfree(struct expr *);
 static struct expr     *exprspec(struct expr *, uint64_t,
                                 const char *, const char *);
 static struct expr     *exprterm(const struct mansearch *, char *, int);
 static struct expr     *exprcomp(const struct mansearch *,
                                int, char *[]);
 static void             exprfree(struct expr *);
 static struct expr     *exprspec(struct expr *, uint64_t,
                                 const char *, const char *);
 static struct expr     *exprterm(const struct mansearch *, char *, int);

+static int              manpage_compare(const void *, const void *);

 static void             sql_append(char **sql, size_t *sz,
                                const char *newstr, int count);
 static void             sql_match(sqlite3_context *context,
 static void             sql_append(char **sql, size_t *sz,
                                const char *newstr, int count);
 static void             sql_match(sqlite3_context *context,


@@ -118,7 +123,8 @@ mansearch_setup(int start)
                }
 
                pagecache = mmap(NULL, PC_PAGESIZE * PC_NUMPAGES,
                }
 
                pagecache = mmap(NULL, PC_PAGESIZE * PC_NUMPAGES,

-                   PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+                   PROT_READ | PROT_WRITE,
+                   MAP_SHARED | MAP_ANON, -1, 0);

 
                if (MAP_FAILED == pagecache) {
                        perror("mmap");
 
                if (MAP_FAILED == pagecache) {
                        perror("mmap");


@@ -153,7 +159,6 @@ int
 mansearch(const struct mansearch *search,
                const struct manpaths *paths,
                int argc, char *argv[],
 mansearch(const struct mansearch *search,
                const struct manpaths *paths,
                int argc, char *argv[],

-               const char *outkey,

                struct manpage **res, size_t *sz)
 {
        int              fd, rc, c, indexbit;
                struct manpage **res, size_t *sz)
 {
        int              fd, rc, c, indexbit;


@@ -171,11 +176,9 @@ mansearch(const struct mansearch *search,
        unsigned int     idx;
        size_t           i, j, cur, maxres;
 
        unsigned int     idx;
        size_t           i, j, cur, maxres;
 

-       memset(&info, 0, sizeof(struct ohash_info));
-
-       info.halloc = hash_halloc;
+       info.calloc = hash_calloc;

        info.alloc = hash_alloc;
        info.alloc = hash_alloc;

-       info.hfree = hash_free;
+       info.free = hash_free;

        info.key_offset = offsetof(struct match, pageid);
 
        *sz = cur = maxres = 0;
        info.key_offset = offsetof(struct match, pageid);
 
        *sz = cur = maxres = 0;


@@ -191,11 +194,11 @@ mansearch(const struct mansearch *search,
                goto out;
 
        outbit = 0;
                goto out;
 
        outbit = 0;

-       if (NULL != outkey) {
+       if (NULL != search->outkey) {

                for (indexbit = 0, iterbit = 1;
                     indexbit < mansearch_keymax;
                     indexbit++, iterbit <<= 1) {
                for (indexbit = 0, iterbit = 1;
                     indexbit < mansearch_keymax;
                     indexbit++, iterbit <<= 1) {

-                       if (0 == strcasecmp(outkey,
+                       if (0 == strcasecmp(search->outkey,

                            mansearch_keynames[indexbit])) {
                                outbit = iterbit;
                                break;
                            mansearch_keynames[indexbit])) {
                                outbit = iterbit;
                                break;


@@ -299,7 +302,7 @@ mansearch(const struct mansearch *search,
                        mp->pageid = pageid;
                        mp->form = sqlite3_column_int(s, 1);
                        if (TYPE_Nd == outbit)
                        mp->pageid = pageid;
                        mp->form = sqlite3_column_int(s, 1);
                        if (TYPE_Nd == outbit)

-                               mp->desc = mandoc_strdup(
+                               mp->desc = mandoc_strdup((const char *)

                                    sqlite3_column_text(s, 0));
                        ohash_insert(&htab, idx, mp);
                }
                                    sqlite3_column_text(s, 0));
                        ohash_insert(&htab, idx, mp);
                }


@@ -332,6 +335,8 @@ mansearch(const struct mansearch *search,
                                    maxres, sizeof(struct manpage));
                        }
                        mpage = *res + cur;
                                    maxres, sizeof(struct manpage));
                        }
                        mpage = *res + cur;

+                       mpage->ipath = i;
+                       mpage->sec = 10;

                        mpage->form = mp->form;
                        buildnames(mpage, db, s, mp->pageid,
                            paths->paths[i], mp->form);
                        mpage->form = mp->form;
                        buildnames(mpage, db, s, mp->pageid,
                            paths->paths[i], mp->form);


@@ -348,6 +353,7 @@ mansearch(const struct mansearch *search,
                sqlite3_close(db);
                ohash_delete(&htab);
        }
                sqlite3_close(db);
                ohash_delete(&htab);
        }

+       qsort(*res, cur, sizeof(struct manpage), manpage_compare);

        rc = 1;
 out:
        if (-1 != fd) {
        rc = 1;
 out:
        if (-1 != fd) {


@@ -361,12 +367,38 @@ out:
        return(rc);
 }
 
        return(rc);
 }
 

+void
+mansearch_free(struct manpage *res, size_t sz)
+{
+       size_t   i;
+
+       for (i = 0; i < sz; i++) {
+               free(res[i].file);
+               free(res[i].names);
+               free(res[i].output);
+       }
+       free(res);
+}
+
+static int
+manpage_compare(const void *vp1, const void *vp2)
+{
+       const struct manpage    *mp1, *mp2;
+       int                      diff;
+
+       mp1 = vp1;
+       mp2 = vp2;
+       diff = mp1->sec - mp2->sec;
+       return(diff ? diff : strcasecmp(mp1->names, mp2->names));
+}
+

 static void
 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
                uint64_t pageid, const char *path, int form)
 {
        char            *newnames, *prevsec, *prevarch;
        const char      *oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
 static void
 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
                uint64_t pageid, const char *path, int form)
 {
        char            *newnames, *prevsec, *prevarch;
        const char      *oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;

+       const char      *gzip;

        size_t           i;
        int              c;
 
        size_t           i;
        int              c;
 


@@ -389,9 +421,14 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 
                /* Fetch the next name. */
 
 
                /* Fetch the next name. */
 

-               sec = sqlite3_column_text(s, 0);
-               arch = sqlite3_column_text(s, 1);
-               name = sqlite3_column_text(s, 2);
+               sec = (const char *)sqlite3_column_text(s, 0);
+               arch = (const char *)sqlite3_column_text(s, 1);
+               name = (const char *)sqlite3_column_text(s, 2);
+
+               /* Remember the first section found. */
+
+               if (9 < mpage->sec && '1' <= *sec && '9' >= *sec)
+                       mpage->sec = (*sec - '1') + 1;

 
                /* If the section changed, append the old one. */
 
 
                /* If the section changed, append the old one. */
 


@@ -427,16 +464,20 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
                if (NULL != mpage->file)
                        continue;
 
                if (NULL != mpage->file)
                        continue;
 

-               if (form) {
+               if (form & FORM_SRC) {

                        sep1 = "man";
                        fsec = sec;
                } else {
                        sep1 = "cat";
                        fsec = "0";
                }
                        sep1 = "man";
                        fsec = sec;
                } else {
                        sep1 = "cat";
                        fsec = "0";
                }

+               if (form & FORM_GZ)
+                       gzip = ".gz";
+               else
+                       gzip = "";

                sep2 = '\0' == *arch ? "" : "/";
                sep2 = '\0' == *arch ? "" : "/";

-               mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
-                   path, sep1, sec, sep2, arch, name, fsec);
+               mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s%s",
+                   path, sep1, sec, sep2, arch, name, fsec, gzip);

        }
        if (SQLITE_DONE != c)
                fprintf(stderr, "%s\n", sqlite3_errmsg(db));
        }
        if (SQLITE_DONE != c)
                fprintf(stderr, "%s\n", sqlite3_errmsg(db));


@@ -475,7 +516,7 @@ buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t pageid, uint64_t outbit)
                        oldoutput = output;
                        sep1 = " # ";
                }
                        oldoutput = output;
                        sep1 = " # ";
                }

-               data = sqlite3_column_text(s, 1);
+               data = (const char *)sqlite3_column_text(s, 1);

                mandoc_asprintf(&newoutput, "%s%s%s",
                    oldoutput, sep1, data);
                free(output);
                mandoc_asprintf(&newoutput, "%s%s%s",
                    oldoutput, sep1, data);
                free(output);


@@ -563,6 +604,9 @@ sql_statement(const struct expr *e)
                    ? (NULL == e->substr
                        ? "pageid IN (SELECT pageid FROM names "
                          "WHERE name REGEXP ?)"
                    ? (NULL == e->substr
                        ? "pageid IN (SELECT pageid FROM names "
                          "WHERE name REGEXP ?)"

+                       : e->equal
+                       ? "pageid IN (SELECT pageid FROM names "
+                         "WHERE name = ?)"

                        : "pageid IN (SELECT pageid FROM names "
                          "WHERE name MATCH ?)")
                    : (NULL == e->substr
                        : "pageid IN (SELECT pageid FROM names "
                          "WHERE name MATCH ?)")
                    : (NULL == e->substr


@@ -704,7 +748,7 @@ exprterm(const struct mansearch *search, char *buf, int cs)
 {
        char             errbuf[BUFSIZ];
        struct expr     *e;
 {
        char             errbuf[BUFSIZ];
        struct expr     *e;

-       char            *key, *v;
+       char            *key, *val;

        uint64_t         iterbit;
        int              i, irc;
 
        uint64_t         iterbit;
        int              i, irc;
 


@@ -713,40 +757,54 @@ exprterm(const struct mansearch *search, char *buf, int cs)
 
        e = mandoc_calloc(1, sizeof(struct expr));
 
 
        e = mandoc_calloc(1, sizeof(struct expr));
 

-       /*"whatis" mode uses an opaque string and default fields. */
-
-       if (MANSEARCH_WHATIS & search->flags) {
+       if (search->argmode == ARG_NAME) {
+               e->bits = TYPE_Nm;

                e->substr = buf;
                e->substr = buf;

-               e->bits = search->deftype;
+               e->equal = 1;

                return(e);
        }
 
        /*
                return(e);
        }
 
        /*

-        * If no =~ is specified, search with equality over names and
-        * descriptions.
-        * If =~ begins the phrase, use name and description fields.
+        * Separate macro keys from search string.
+        * If needed, request regular expression handling
+        * by setting e->substr to NULL.

         */
 
         */
 

-       if (NULL == (v = strpbrk(buf, "=~"))) {
+       if (search->argmode == ARG_WORD) {
+               e->bits = TYPE_Nm;
+               e->substr = NULL;
+               mandoc_asprintf(&val, "[[:<:]]%s[[:>:]]", buf);
+               cs = 0;
+       } else if ((val = strpbrk(buf, "=~")) == NULL) {
+               e->bits = TYPE_Nm | TYPE_Nd;

                e->substr = buf;
                e->substr = buf;

-               e->bits = search->deftype;
-               return(e);
-       } else if (v == buf)
-               e->bits = search->deftype;
-
-       if ('~' == *v++) {
+       } else {
+               if (val == buf)
+                       e->bits = TYPE_Nm | TYPE_Nd;
+               if ('=' == *val)
+                       e->substr = val + 1;
+               *val++ = '\0';

                if (NULL != strstr(buf, "arch"))
                        cs = 0;
                if (NULL != strstr(buf, "arch"))
                        cs = 0;

-               if (0 != (irc = regcomp(&e->regexp, v,
-                   REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE)))) {
+       }
+
+       /* Compile regular expressions. */
+
+       if (NULL == e->substr) {
+               irc = regcomp(&e->regexp, val,
+                   REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE));
+               if (search->argmode == ARG_WORD)
+                       free(val);
+               if (irc) {

                        regerror(irc, &e->regexp, errbuf, sizeof(errbuf));
                        fprintf(stderr, "regcomp: %s\n", errbuf);
                        free(e);
                        return(NULL);
                }
                        regerror(irc, &e->regexp, errbuf, sizeof(errbuf));
                        fprintf(stderr, "regcomp: %s\n", errbuf);
                        free(e);
                        return(NULL);
                }

-       } else
-               e->substr = v;
-       v[-1] = '\0';
+       }
+
+       if (e->bits)
+               return(e);

 
        /*
         * Parse out all possible fields.
 
        /*
         * Parse out all possible fields.


@@ -790,10 +848,10 @@ exprfree(struct expr *p)
 }
 
 static void *
 }
 
 static void *

-hash_halloc(size_t sz, void *arg)
+hash_calloc(size_t nmemb, size_t sz, void *arg)

 {
 
 {
 

-       return(mandoc_calloc(1, sz));
+       return(mandoc_calloc(nmemb, sz));

 }
 
 static void *
 }
 
 static void *


@@ -804,7 +862,7 @@ hash_alloc(size_t sz, void *arg)
 }
 
 static void
 }
 
 static void

-hash_free(void *p, size_t sz, void *arg)
+hash_free(void *p, void *arg)

 {
 
        free(p);
 {
 
        free(p);