=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.62 retrieving revision 1.67 diff -u -p -r1.62 -r1.67 --- mandoc/mandocdb.c 2013/06/06 02:40:37 1.62 +++ mandoc/mandocdb.c 2013/06/07 04:51:26 1.67 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.62 2013/06/06 02:40:37 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.67 2013/06/07 04:51:26 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013 Ingo Schwarze @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -83,7 +84,6 @@ enum form { struct str { char *utf8; /* key in UTF-8 form */ const struct of *of; /* if set, the owning parse */ - struct str *next; /* next in owning parse sequence */ uint64_t mask; /* bitmask in sequence */ char key[]; /* the string itself */ }; @@ -99,11 +99,11 @@ struct of { enum form dform; /* path-cued form */ enum form sform; /* suffix-cued form */ char file[PATH_MAX]; /* filename rel. to manpath */ - const char *desc; /* parsed description */ - const char *sec; /* suffix-cued section (or empty) */ - const char *dsec; /* path-cued section (or empty) */ - const char *arch; /* path-cued arch. (or empty) */ - const char *name; /* name (from filename) (not empty) */ + char *desc; /* parsed description */ + char *name; /* name (from filename) (not empty) */ + char *sec; /* suffix-cued section (or empty) */ + char *dsec; /* path-cued section (or empty) */ + char *arch; /* path-cued arch. (or empty) */ }; enum stmt { @@ -129,7 +129,6 @@ static void dbprune(void); static void fileadd(struct of *); static int filecheck(const char *); static void filescan(const char *); -static struct str *hashget(const char *, size_t); static void *hash_alloc(size_t, void *); static void hash_free(void *, size_t, void *); static void *hash_halloc(size_t, void *); @@ -138,7 +137,8 @@ static int inocheck(const struct stat *); static void ofadd(int, const char *, const char *, const char *, const char *, const char *, const struct stat *); static void offree(void); -static void ofmerge(struct mchars *, struct mparse *); +static void ofmerge(struct mchars *, struct mparse *, + struct ohash_info*); static void parse_catpage(struct of *); static void parse_man(struct of *, const struct man_node *); static void parse_mdoc(struct of *, const struct mdoc_node *); @@ -156,17 +156,13 @@ static int set_basedir(const char *); static void putkey(const struct of *, const char *, uint64_t); static void putkeys(const struct of *, - const char *, int, uint64_t); + const char *, size_t, uint64_t); static void putmdockey(const struct of *, const struct mdoc_node *, uint64_t); static void say(const char *, const char *, ...); -static char *stradd(const char *); -static char *straddbuf(const char *, size_t); static int treescan(void); static size_t utf8(unsigned int, char [7]); static void utf8key(struct mchars *, struct str *); -static void wordaddbuf(const struct of *, - const char *, size_t, uint64_t); static char *progname; static int use_all; /* use all found files */ @@ -180,7 +176,6 @@ static struct ohash inos; /* table of inodes/devices static struct ohash filenames; /* table of filenames */ static struct ohash strings; /* table of all strings */ static struct of *ofs = NULL; /* vector of files to parse */ -static struct str *words = NULL; /* word list in current parse */ static sqlite3 *db = NULL; /* current database */ static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ @@ -313,10 +308,8 @@ int main(int argc, char *argv[]) { int ch, i; - unsigned int index; size_t j, sz; const char *path_arg; - struct str *s; struct mchars *mc; struct manpaths dirs; struct mparse *mp; @@ -408,7 +401,6 @@ main(int argc, char *argv[]) MANDOCLEVEL_FATAL, NULL, NULL, NULL); mc = mchars_alloc(); - ohash_init(&strings, 6, &str_info); ohash_init(&inos, 6, &ino_info); ohash_init(&filenames, 6, &filename_info); @@ -432,7 +424,7 @@ main(int argc, char *argv[]) if (OP_TEST != op) dbprune(); if (OP_DELETE != op) - ofmerge(mc, mp); + ofmerge(mc, mp, &str_info); dbclose(1); } else { /* @@ -462,6 +454,12 @@ main(int argc, char *argv[]) dirs.paths[j][--sz] = '\0'; if (0 == sz) continue; + + if (j) { + ohash_init(&inos, 6, &ino_info); + ohash_init(&filenames, 6, &filename_info); + } + if (0 == set_basedir(dirs.paths[j])) goto out; if (0 == treescan()) @@ -480,13 +478,14 @@ main(int argc, char *argv[]) SQL_EXEC("PRAGMA synchronous = OFF"); #endif - ofmerge(mc, mp); + ofmerge(mc, mp, &str_info); dbclose(0); - offree(); - ohash_delete(&inos); - ohash_init(&inos, 6, &ino_info); - ohash_delete(&filenames); - ohash_init(&filenames, 6, &filename_info); + + if (j + 1 < dirs.sz) { + ohash_delete(&inos); + ohash_delete(&filenames); + offree(); + } } } out: @@ -494,13 +493,6 @@ out: manpath_free(&dirs); mchars_free(mc); mparse_free(mp); - for (s = ohash_first(&strings, &index); - NULL != s; s = ohash_next(&strings, &index)) { - if (s->utf8 != s->key) - free(s->utf8); - free(s); - } - ohash_delete(&strings); ohash_delete(&inos); ohash_delete(&filenames); offree(); @@ -538,7 +530,7 @@ treescan(void) FTSENT *ff; int dform; char *sec; - const char *dsec, *arch, *cp, *name, *path; + const char *dsec, *arch, *cp, *path; const char *argv[2]; argv[0] = "."; @@ -606,13 +598,10 @@ treescan(void) if (warnings) say(path, "Wrong filename suffix"); continue; - } else { + } else sec[-1] = '\0'; - sec = stradd(sec); - } - name = stradd(ff->fts_name); - ofadd(dform, path, - name, dsec, sec, arch, ff->fts_statp); + ofadd(dform, path, ff->fts_name, dsec, sec, + arch, ff->fts_statp); continue; } else if (FTS_D != ff->fts_info && FTS_DP != ff->fts_info) { @@ -639,10 +628,10 @@ treescan(void) if (0 == strncmp(cp, "man", 3)) { dform = FORM_SRC; - dsec = stradd(cp + 3); + dsec = cp + 3; } else if (0 == strncmp(cp, "cat", 3)) { dform = FORM_CAT; - dsec = stradd(cp + 3); + dsec = cp + 3; } if (NULL != dsec || use_all) @@ -659,7 +648,7 @@ treescan(void) */ arch = NULL; if (FTS_DP != ff->fts_info && NULL != dsec) - arch = stradd(ff->fts_name); + arch = ff->fts_name; break; default: if (FTS_DP == ff->fts_info || use_all) @@ -785,10 +774,9 @@ filescan(const char *file) static int filecheck(const char *name) { - unsigned int index; - index = ohash_qlookup(&filenames, name); - return(NULL != ohash_find(&filenames, index)); + return(NULL != ohash_find(&filenames, + ohash_qlookup(&filenames, name))); } /* @@ -798,11 +786,11 @@ filecheck(const char *name) static void fileadd(struct of *of) { - unsigned int index; + unsigned int slot; - index = ohash_qlookup(&filenames, of->file); - assert(NULL == ohash_find(&filenames, index)); - ohash_insert(&filenames, index, of); + slot = ohash_qlookup(&filenames, of->file); + assert(NULL == ohash_find(&filenames, slot)); + ohash_insert(&filenames, slot, of); } /* @@ -813,15 +801,13 @@ inocheck(const struct stat *st) { struct id id; uint32_t hash; - unsigned int index; memset(&id, 0, sizeof(id)); id.ino = hash = st->st_ino; id.dev = st->st_dev; - index = ohash_lookup_memory - (&inos, (char *)&id, sizeof(id), hash); - return(NULL != ohash_find(&inos, index)); + return(NULL != ohash_find(&inos, ohash_lookup_memory( + &inos, (char *)&id, sizeof(id), hash))); } /* @@ -833,15 +819,15 @@ static void inoadd(const struct stat *st, struct of *of) { uint32_t hash; - unsigned int index; + unsigned int slot; of->id.ino = hash = st->st_ino; of->id.dev = st->st_dev; - index = ohash_lookup_memory + slot = ohash_lookup_memory (&inos, (char *)&of->id, sizeof(of->id), hash); - assert(NULL == ohash_find(&inos, index)); - ohash_insert(&inos, index, of); + assert(NULL == ohash_find(&inos, slot)); + ohash_insert(&inos, slot, of); } static void @@ -872,10 +858,10 @@ ofadd(int dform, const char *file, const char *name, c of = mandoc_calloc(1, sizeof(struct of)); strlcpy(of->file, file, PATH_MAX); - of->name = name; - of->sec = sec; - of->dsec = dsec; - of->arch = arch; + of->name = mandoc_strdup(name); + of->sec = mandoc_strdup(sec); + of->dsec = mandoc_strdup(dsec); + of->arch = mandoc_strdup(arch); of->sform = sform; of->dform = dform; of->next = ofs; @@ -897,6 +883,10 @@ offree(void) while (NULL != (of = ofs)) { ofs = of->next; + free(of->name); + free(of->sec); + free(of->dsec); + free(of->arch); free(of); } } @@ -909,7 +899,8 @@ offree(void) * and filename to determine whether the file is parsable or not. */ static void -ofmerge(struct mchars *mc, struct mparse *mp) +ofmerge(struct mchars *mc, struct mparse *mp, + struct ohash_info *infop) { int form; size_t sz; @@ -950,7 +941,7 @@ ofmerge(struct mchars *mc, struct mparse *mp) } } - words = NULL; + ohash_init(&strings, 6, infop); mparse_reset(mp); mdoc = NULL; man = NULL; @@ -1028,13 +1019,17 @@ ofmerge(struct mchars *mc, struct mparse *mp) if (NULL != mdoc) { if (NULL != (cp = mdoc_meta(mdoc)->name)) putkey(of, cp, TYPE_Nm); + assert(NULL == of->desc); parse_mdoc(of, mdoc_node(mdoc)); + putkey(of, NULL != of->desc ? + of->desc : of->name, TYPE_Nd); } else if (NULL != man) parse_man(of, man_node(man)); else parse_catpage(of); dbindex(mc, form, of); + ohash_delete(&strings); } } @@ -1101,6 +1096,8 @@ parse_catpage(struct of *of) if (NULL == title || '\0' == *title) { if (warnings) say(of->file, "Cannot find NAME section"); + assert(NULL == of->desc); + of->desc = mandoc_strdup(of->name); putkey(of, of->name, TYPE_Nd); fclose(stream); free(title); @@ -1139,8 +1136,9 @@ parse_catpage(struct of *of) plen -= 2; } - of->desc = stradd(p); - putkey(of, p, TYPE_Nd); + assert(NULL == of->desc); + of->desc = mandoc_strdup(p); + putkey(of, of->desc, TYPE_Nd); fclose(stream); free(title); } @@ -1153,20 +1151,10 @@ putkey(const struct of *of, const char *value, uint64_ { assert(NULL != value); - wordaddbuf(of, value, strlen(value), type); + putkeys(of, value, strlen(value), type); } /* - * Like putkey() but for unterminated strings. - */ -static void -putkeys(const struct of *of, const char *value, int sz, uint64_t type) -{ - - wordaddbuf(of, value, sz, type); -} - -/* * Grok all nodes at or below a certain mdoc node into putkey(). */ static void @@ -1314,8 +1302,8 @@ parse_man(struct of *of, const struct man_node *n) start++; assert(NULL == of->desc); - of->desc = stradd(start); - putkey(of, start, TYPE_Nd); + of->desc = mandoc_strdup(start); + putkey(of, of->desc, TYPE_Nd); free(title); return; } @@ -1458,19 +1446,29 @@ parse_mdoc_St(struct of *of, const struct mdoc_node *n static int parse_mdoc_Xr(struct of *of, const struct mdoc_node *n) { + char *cp; if (NULL == (n = n->child)) return(0); - putkey(of, n->string, TYPE_Xr); - return(1); + if (NULL == n->next) { + putkey(of, n->string, TYPE_Xr); + return(0); + } + + if (-1 == asprintf(&cp, "%s(%s)", n->string, n->next->string)) { + perror(NULL); + exit((int)MANDOCLEVEL_SYSERR); + } + putkey(of, cp, TYPE_Xr); + free(cp); + return(0); } static int parse_mdoc_Nd(struct of *of, const struct mdoc_node *n) { size_t sz; - char *sv, *desc; if (MDOC_BODY != n->type) return(0); @@ -1480,25 +1478,20 @@ parse_mdoc_Nd(struct of *of, const struct mdoc_node *n * into the document table. */ - desc = NULL; for (n = n->child; NULL != n; n = n->next) { if (MDOC_TEXT == n->type) { - sz = strlen(n->string) + 1; - if (NULL != (sv = desc)) - sz += strlen(desc) + 1; - desc = mandoc_realloc(desc, sz); - if (NULL != sv) - strlcat(desc, " ", sz); - else - *desc = '\0'; - strlcat(desc, n->string, sz); + if (NULL != of->desc) { + sz = strlen(of->desc) + + strlen(n->string) + 2; + of->desc = mandoc_realloc(of->desc, sz); + strlcat(of->desc, " ", sz); + strlcat(of->desc, n->string, sz); + } else + of->desc = mandoc_strdup(n->string); } if (NULL != n->child) parse_mdoc_Nd(of, n); } - - of->desc = NULL != desc ? stradd(desc) : NULL; - free(desc); return(1); } @@ -1536,76 +1529,23 @@ parse_mdoc_body(struct of *of, const struct mdoc_node } /* - * See straddbuf(). + * Add a string to the hash table for the current manual. + * Each string has a bitmask telling which macros it belongs to. + * When we finish the manual, we'll dump the table. */ -static char * -stradd(const char *cp) -{ - - return(straddbuf(cp, strlen(cp))); -} - -/* - * This looks up or adds a string to the string table. - * The string table is a table of all strings encountered during parse - * or file scan. - * In using it, we avoid having thousands of (e.g.) "cat1" string - * allocations for the "of" table. - * We also have a layer atop the string table for keeping track of words - * in a parse sequence (see wordaddbuf()). - */ -static char * -straddbuf(const char *cp, size_t sz) -{ - struct str *s; - unsigned int index; - const char *end; - - if (NULL != (s = hashget(cp, sz))) - return(s->key); - - s = mandoc_calloc(sizeof(struct str) + sz + 1, 1); - memcpy(s->key, cp, sz); - - end = cp + sz; - index = ohash_qlookupi(&strings, cp, &end); - assert(NULL == ohash_find(&strings, index)); - ohash_insert(&strings, index, s); - return(s->key); -} - -static struct str * -hashget(const char *cp, size_t sz) -{ - unsigned int index; - const char *end; - - end = cp + sz; - index = ohash_qlookupi(&strings, cp, &end); - return(ohash_find(&strings, index)); -} - -/* - * Add a word to the current parse sequence. - * Within the hashtable of strings, we maintain a list of strings that - * are currently indexed. - * Each of these ("words") has a bitmask modified within the parse. - * When we finish a parse, we'll dump the list, then remove the head - * entry -- since the next parse will have a new "of", it can keep track - * of its entries without conflict. - */ static void -wordaddbuf(const struct of *of, - const char *cp, size_t sz, uint64_t v) +putkeys(const struct of *of, const char *cp, size_t sz, uint64_t v) { struct str *s; - unsigned int index; + unsigned int slot; const char *end; if (0 == sz) return; - s = hashget(cp, sz); + end = cp + sz; + slot = ohash_qlookupi(&strings, cp, &end); + s = ohash_find(&strings, slot); if (NULL != s && of == s->of) { s->mask |= v; @@ -1613,16 +1553,10 @@ wordaddbuf(const struct of *of, } else if (NULL == s) { s = mandoc_calloc(sizeof(struct str) + sz + 1, 1); memcpy(s->key, cp, sz); - end = cp + sz; - index = ohash_qlookupi(&strings, cp, &end); - assert(NULL == ohash_find(&strings, index)); - ohash_insert(&strings, index, s); + ohash_insert(&strings, slot, s); } - - s->next = words; s->of = of; s->mask = v; - words = s; } /* @@ -1794,6 +1728,7 @@ dbindex(struct mchars *mc, int form, const struct of * const char *desc; int64_t recno; size_t i; + unsigned int slot; if (verb) say(of->file, "Adding to index"); @@ -1803,7 +1738,8 @@ dbindex(struct mchars *mc, int form, const struct of * desc = ""; if (NULL != of->desc) { - key = hashget(of->desc, strlen(of->desc)); + key = ohash_find(&strings, + ohash_qlookup(&strings, of->desc)); assert(NULL != key); if (NULL == key->utf8) utf8key(mc, key); @@ -1822,7 +1758,8 @@ dbindex(struct mchars *mc, int form, const struct of * recno = sqlite3_last_insert_rowid(db); sqlite3_reset(stmts[STMT_INSERT_DOC]); - for (key = words; NULL != key; key = key->next) { + for (key = ohash_first(&strings, &slot); NULL != key; + key = ohash_next(&strings, &slot)) { assert(key->of == of); if (NULL == key->utf8) utf8key(mc, key); @@ -1832,6 +1769,9 @@ dbindex(struct mchars *mc, int form, const struct of * SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, recno); SQL_STEP(stmts[STMT_INSERT_KEY]); sqlite3_reset(stmts[STMT_INSERT_KEY]); + if (key->utf8 != key->key) + free(key->utf8); + free(key); } SQL_EXEC("END TRANSACTION"); @@ -1864,7 +1804,6 @@ static void dbclose(int real) { size_t i; - char file[PATH_MAX]; if (nodb) return; @@ -1880,9 +1819,7 @@ dbclose(int real) if (real) return; - strlcpy(file, MANDOC_DB, PATH_MAX); - strlcat(file, "~", PATH_MAX); - if (-1 == rename(file, MANDOC_DB)) { + if (-1 == rename(MANDOC_DB "~", MANDOC_DB)) { exitcode = (int)MANDOCLEVEL_SYSERR; say(MANDOC_DB, NULL); } @@ -1899,28 +1836,23 @@ dbclose(int real) static int dbopen(int real) { - char file[PATH_MAX]; - const char *sql; + const char *file, *sql; int rc, ofl; - size_t sz; if (nodb) return(1); - sz = strlcpy(file, MANDOC_DB, PATH_MAX); - if ( ! real) - sz = strlcat(file, "~", PATH_MAX); - - if (sz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long\n", file); - return(0); - } - - if ( ! real) - remove(file); - - ofl = SQLITE_OPEN_READWRITE | - (0 == real ? SQLITE_OPEN_EXCLUSIVE : 0); + ofl = SQLITE_OPEN_READWRITE; + if (0 == real) { + file = MANDOC_DB "~"; + if (-1 == remove(file) && ENOENT != errno) { + exitcode = (int)MANDOCLEVEL_SYSERR; + say(file, NULL); + return(0); + } + ofl |= SQLITE_OPEN_EXCLUSIVE; + } else + file = MANDOC_DB; rc = sqlite3_open_v2(file, &db, ofl, NULL); if (SQLITE_OK == rc)