=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.79 retrieving revision 1.90 diff -u -p -r1.79 -r1.90 --- mandoc/mandocdb.c 2013/12/26 22:30:41 1.79 +++ mandoc/mandocdb.c 2013/12/27 23:41:55 1.90 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.79 2013/12/26 22:30:41 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.90 2013/12/27 23:41:55 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013 Ingo Schwarze @@ -76,9 +76,9 @@ enum op { }; enum form { - FORM_SRC, /* format is -man or -mdoc */ - FORM_CAT, /* format is cat */ - FORM_NONE /* format is unknown */ + FORM_NONE, /* format is unknown */ + FORM_SRC, /* format is -man or -mdoc */ + FORM_CAT /* format is cat */ }; struct str { @@ -95,15 +95,23 @@ struct inodev { struct mpage { struct inodev inodev; /* used for hashing routine */ - struct mpage *next; /* next in mpages_list */ - enum form dform; /* path-cued form */ - enum form sform; /* suffix-cued form */ + enum form form; /* format from file content */ + char *sec; /* section from file content */ + char *arch; /* architecture from file content */ + char *title; /* title from file content */ + char *desc; /* description from file content */ + struct mlink *mlinks; /* singly linked list */ +}; + +struct mlink { char file[PATH_MAX]; /* filename rel. to manpath */ - 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 form dform; /* format from directory */ + enum form fform; /* format from file name suffix */ + char *dsec; /* section from directory */ + char *arch; /* architecture from directory */ + char *name; /* name from file name (not empty) */ + char *fsec; /* section from file name suffix */ + struct mlink *next; /* singly linked list */ }; struct title { @@ -112,9 +120,10 @@ struct title { }; enum stmt { - STMT_DELETE = 0, /* delete manpage */ - STMT_INSERT_DOC, /* insert manpage */ - STMT_INSERT_KEY, /* insert parsed key */ + STMT_DELETE_PAGE = 0, /* delete mpage */ + STMT_INSERT_PAGE, /* insert mpage */ + STMT_INSERT_LINK, /* insert mlink */ + STMT_INSERT_KEY, /* insert parsed key */ STMT__MAX }; @@ -126,19 +135,16 @@ struct mdoc_handler { }; static void dbclose(int); -static void dbindex(struct mchars *, int, const struct mpage *); +static void dbindex(const struct mpage *, struct mchars *); static int dbopen(int); static void dbprune(void); -static void fileadd(struct mpage *); -static int filecheck(const char *); static void filescan(const char *); static void *hash_alloc(size_t, void *); static void hash_free(void *, size_t, void *); static void *hash_halloc(size_t, void *); -static void inoadd(const struct stat *, struct mpage *); -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 mlink_add(struct mlink *, const struct stat *); +static void mlink_free(struct mlink *); +static void mlinks_undupe(struct mpage *); static void mpages_free(void); static void mpages_merge(struct mchars *, struct mparse *, int); static void parse_cat(struct mpage *); @@ -154,7 +160,6 @@ static int parse_mdoc_Nm(struct mpage *, const struct static int parse_mdoc_Sh(struct mpage *, const struct mdoc_node *); static int parse_mdoc_St(struct mpage *, const struct mdoc_node *); static int parse_mdoc_Xr(struct mpage *, const struct mdoc_node *); -static int set_basedir(const char *); static void putkey(const struct mpage *, const char *, uint64_t); static void putkeys(const struct mpage *, @@ -162,6 +167,7 @@ static void putkeys(const struct mpage *, static void putmdockey(const struct mpage *, const struct mdoc_node *, uint64_t); static void say(const char *, const char *, ...); +static int set_basedir(const char *); static int treescan(void); static size_t utf8(unsigned int, char [7]); static void utf8key(struct mchars *, struct str *); @@ -175,9 +181,8 @@ static int exitcode; /* to be returned by main */ static enum op op; /* operational mode */ static char basedir[PATH_MAX]; /* current base directory */ static struct ohash mpages; /* table of distinct manual pages */ -static struct ohash filenames; /* table of filenames */ +static struct ohash mlinks; /* table of directory entries */ static struct ohash strings; /* table of all strings */ -static struct mpage *mpages_list = NULL; /* vector of files to parse */ static sqlite3 *db = NULL; /* current database */ static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ @@ -315,17 +320,17 @@ main(int argc, char *argv[]) struct mchars *mc; struct manpaths dirs; struct mparse *mp; - struct ohash_info mpages_info, filename_info; + struct ohash_info mpages_info, mlinks_info; memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); memset(&dirs, 0, sizeof(struct manpaths)); - mpages_info.alloc = filename_info.alloc = hash_alloc; - mpages_info.halloc = filename_info.halloc = hash_halloc; - mpages_info.hfree = filename_info.hfree = hash_free; + mpages_info.alloc = mlinks_info.alloc = hash_alloc; + mpages_info.halloc = mlinks_info.halloc = hash_halloc; + mpages_info.hfree = mlinks_info.hfree = hash_free; mpages_info.key_offset = offsetof(struct mpage, inodev); - filename_info.key_offset = offsetof(struct mpage, file); + mlinks_info.key_offset = offsetof(struct mlink, file); progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -400,7 +405,7 @@ main(int argc, char *argv[]) mc = mchars_alloc(); ohash_init(&mpages, 6, &mpages_info); - ohash_init(&filenames, 6, &filename_info); + ohash_init(&mlinks, 6, &mlinks_info); if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { /* @@ -454,7 +459,7 @@ main(int argc, char *argv[]) if (j) { ohash_init(&mpages, 6, &mpages_info); - ohash_init(&filenames, 6, &filename_info); + ohash_init(&mlinks, 6, &mlinks_info); } if (0 == set_basedir(dirs.paths[j])) @@ -470,9 +475,9 @@ main(int argc, char *argv[]) dbclose(0); if (j + 1 < dirs.sz) { - ohash_delete(&mpages); - ohash_delete(&filenames); mpages_free(); + ohash_delete(&mpages); + ohash_delete(&mlinks); } } } @@ -481,9 +486,9 @@ out: manpath_free(&dirs); mchars_free(mc); mparse_free(mp); - ohash_delete(&mpages); - ohash_delete(&filenames); mpages_free(); + ohash_delete(&mpages); + ohash_delete(&mlinks); return(exitcode); usage: fprintf(stderr, "usage: %s [-anvW] [-C file]\n" @@ -516,8 +521,9 @@ treescan(void) { FTS *f; FTSENT *ff; + struct mlink *mlink; int dform; - char *sec; + char *fsec; const char *dsec, *arch, *cp, *path; const char *argv[2]; @@ -541,9 +547,8 @@ treescan(void) while (NULL != (ff = fts_read(f))) { path = ff->fts_path + 2; /* - * If we're a regular file, add an mpage by using the + * If we're a regular file, add an mlink by using the * stored directory data and handling the filename. - * Disallow duplicate (hard-linked) files. */ if (FTS_F == ff->fts_info) { if (0 == strcmp(path, MANDOC_DB)) @@ -552,11 +557,7 @@ treescan(void) if (warnings) say(path, "Extraneous file"); continue; - } else if (inocheck(ff->fts_statp)) { - if (warnings) - say(path, "Duplicate file"); - continue; - } else if (NULL == (sec = + } else if (NULL == (fsec = strrchr(ff->fts_name, '.'))) { if ( ! use_all) { if (warnings) @@ -564,34 +565,43 @@ treescan(void) "No filename suffix"); continue; } - } else if (0 == strcmp(++sec, "html")) { + } else if (0 == strcmp(++fsec, "html")) { if (warnings) say(path, "Skip html"); continue; - } else if (0 == strcmp(sec, "gz")) { + } else if (0 == strcmp(fsec, "gz")) { if (warnings) say(path, "Skip gz"); continue; - } else if (0 == strcmp(sec, "ps")) { + } else if (0 == strcmp(fsec, "ps")) { if (warnings) say(path, "Skip ps"); continue; - } else if (0 == strcmp(sec, "pdf")) { + } else if (0 == strcmp(fsec, "pdf")) { if (warnings) say(path, "Skip pdf"); continue; } else if ( ! use_all && - ((FORM_SRC == dform && strcmp(sec, dsec)) || - (FORM_CAT == dform && strcmp(sec, "0")))) { + ((FORM_SRC == dform && strcmp(fsec, dsec)) || + (FORM_CAT == dform && strcmp(fsec, "0")))) { if (warnings) say(path, "Wrong filename suffix"); continue; } else - sec[-1] = '\0'; - ofadd(dform, path, ff->fts_name, dsec, sec, - arch, ff->fts_statp); + fsec[-1] = '\0'; + mlink = mandoc_calloc(1, sizeof(struct mlink)); + strlcpy(mlink->file, path, sizeof(mlink->file)); + mlink->dform = dform; + if (NULL != dsec) + mlink->dsec = mandoc_strdup(dsec); + if (NULL != arch) + mlink->arch = mandoc_strdup(arch); + mlink->name = mandoc_strdup(ff->fts_name); + if (NULL != fsec) + mlink->fsec = mandoc_strdup(fsec); + mlink_add(mlink, ff->fts_statp); continue; - } else if (FTS_D != ff->fts_info && + } else if (FTS_D != ff->fts_info && FTS_DP != ff->fts_info) { if (warnings) say(path, "Not a regular file"); @@ -653,7 +663,7 @@ treescan(void) } /* - * Add a file to the file vector. + * Add a file to the mlinks table. * Do not verify that it's a "valid" looking manpage (we'll do that * later). * @@ -664,17 +674,15 @@ treescan(void) * or * [./]cat
[/]/.0 * - * Stuff this information directly into the mpage vector. * See treescan() for the fts(3) version of this. */ static void filescan(const char *file) { char buf[PATH_MAX]; - const char *sec, *arch, *name, *dsec; - char *p, *start; - int dform; struct stat st; + struct mlink *mlink; + char *p, *start; assert(use_all); @@ -697,14 +705,10 @@ filescan(const char *file) exitcode = (int)MANDOCLEVEL_BADARG; say(file, "Not a regular file"); return; - } else if (inocheck(&st)) { - if (warnings) - say(file, "Duplicate file"); - return; } start = buf + strlen(basedir); - sec = arch = name = dsec = NULL; - dform = FORM_NONE; + mlink = mandoc_calloc(1, sizeof(struct mlink)); + strlcpy(mlink->file, start, sizeof(mlink->file)); /* * First try to guess our directory structure. @@ -715,19 +719,19 @@ filescan(const char *file) if (NULL != (p = strchr(start, '/'))) { *p++ = '\0'; if (0 == strncmp(start, "man", 3)) { - dform = FORM_SRC; - dsec = start + 3; + mlink->dform = FORM_SRC; + mlink->dsec = mandoc_strdup(start + 3); } else if (0 == strncmp(start, "cat", 3)) { - dform = FORM_CAT; - dsec = start + 3; + mlink->dform = FORM_CAT; + mlink->dsec = mandoc_strdup(start + 3); } start = p; - if (NULL != dsec && NULL != (p = strchr(start, '/'))) { + if (NULL != mlink->dsec && NULL != (p = strchr(start, '/'))) { *p++ = '\0'; - arch = start; + mlink->arch = mandoc_strdup(start); start = p; - } + } } /* @@ -740,148 +744,152 @@ filescan(const char *file) if ('.' == *p) { *p++ = '\0'; - sec = p; + mlink->fsec = mandoc_strdup(p); } /* * Now try to parse the name. * Use the filename portion of the path. */ - name = start; + mlink->name = start; if (NULL != (p = strrchr(start, '/'))) { - name = p + 1; + mlink->name = p + 1; *p = '\0'; - } + } + mlink->name = mandoc_strdup(mlink->name); - ofadd(dform, file, name, dsec, sec, arch, &st); + mlink_add(mlink, &st); } -/* - * See fileadd(). - */ -static int -filecheck(const char *name) -{ - - return(NULL != ohash_find(&filenames, - ohash_qlookup(&filenames, name))); -} - -/* - * Use the standard hashing mechanism (K&R) to see if the given filename - * already exists. - */ static void -fileadd(struct mpage *mpage) +mlink_add(struct mlink *mlink, const struct stat *st) { + struct inodev inodev; + struct mpage *mpage; unsigned int slot; - slot = ohash_qlookup(&filenames, mpage->file); - assert(NULL == ohash_find(&filenames, slot)); - ohash_insert(&filenames, slot, mpage); -} + assert(NULL != mlink->file); -/* - * See inoadd(). - */ -static int -inocheck(const struct stat *st) -{ - struct inodev inodev; - uint32_t hash; + if (NULL == mlink->dsec) + mlink->dsec = mandoc_strdup(""); + if (NULL == mlink->arch) + mlink->arch = mandoc_strdup(""); + if (NULL == mlink->name) + mlink->name = mandoc_strdup(""); + if (NULL == mlink->fsec) + mlink->fsec = mandoc_strdup(""); - memset(&inodev, 0, sizeof(inodev)); - inodev.st_ino = hash = st->st_ino; - inodev.st_dev = st->st_dev; + if ('0' == *mlink->fsec) { + free(mlink->fsec); + mlink->fsec = mandoc_strdup(mlink->dsec); + mlink->fform = FORM_CAT; + } else if ('1' <= *mlink->fsec && '9' >= *mlink->fsec) + mlink->fform = FORM_SRC; + else + mlink->fform = FORM_NONE; - return(NULL != ohash_find(&mpages, ohash_lookup_memory( - &mpages, (char *)&inodev, sizeof(inodev), hash))); -} + slot = ohash_qlookup(&mlinks, mlink->file); + assert(NULL == ohash_find(&mlinks, slot)); + ohash_insert(&mlinks, slot, mlink); -/* - * The hashing function used here is quite simple: simply take the inode - * and use uint32_t of its bits. - * Then when we do the lookup, use both the inode and device identifier. - */ -static void -inoadd(const struct stat *st, struct mpage *mpage) -{ - uint32_t hash; - unsigned int slot; - - mpage->inodev.st_ino = hash = st->st_ino; - mpage->inodev.st_dev = st->st_dev; - slot = ohash_lookup_memory(&mpages, - (char *)&mpage->inodev, sizeof(mpage->inodev), hash); - - assert(NULL == ohash_find(&mpages, slot)); - ohash_insert(&mpages, slot, mpage); + inodev.st_ino = st->st_ino; + inodev.st_dev = st->st_dev; + slot = ohash_lookup_memory(&mpages, (char *)&inodev, + sizeof(struct inodev), inodev.st_ino); + mpage = ohash_find(&mpages, slot); + if (NULL == mpage) { + mpage = mandoc_calloc(1, sizeof(struct mpage)); + mpage->inodev.st_ino = inodev.st_ino; + mpage->inodev.st_dev = inodev.st_dev; + ohash_insert(&mpages, slot, mpage); + } else + mlink->next = mpage->mlinks; + mpage->mlinks = mlink; } static void -ofadd(int dform, const char *file, const char *name, const char *dsec, - const char *sec, const char *arch, const struct stat *st) +mlink_free(struct mlink *mlink) { - struct mpage *mpage; - int sform; - assert(NULL != file); - - if (NULL == name) - name = ""; - if (NULL == sec) - sec = ""; - if (NULL == dsec) - dsec = ""; - if (NULL == arch) - arch = ""; - - if ('0' == *sec) { - sec = dsec; - sform = FORM_CAT; - } else if ('1' <= *sec && '9' >= *sec) - sform = FORM_SRC; - else - sform = FORM_NONE; - - mpage = mandoc_calloc(1, sizeof(struct mpage)); - strlcpy(mpage->file, file, PATH_MAX); - mpage->name = mandoc_strdup(name); - mpage->sec = mandoc_strdup(sec); - mpage->dsec = mandoc_strdup(dsec); - mpage->arch = mandoc_strdup(arch); - mpage->sform = sform; - mpage->dform = dform; - mpage->next = mpages_list; - mpages_list = mpage; - - /* - * Add to unique identifier hash. - * Then if it's a source manual and we're going to use source in - * favour of catpages, add it to that hash. - */ - inoadd(st, mpage); - fileadd(mpage); + free(mlink->dsec); + free(mlink->arch); + free(mlink->name); + free(mlink->fsec); + free(mlink); } static void mpages_free(void) { struct mpage *mpage; + struct mlink *mlink; + unsigned int slot; - while (NULL != (mpage = mpages_list)) { - mpages_list = mpage->next; - free(mpage->name); + mpage = ohash_first(&mpages, &slot); + while (NULL != mpage) { + while (NULL != (mlink = mpage->mlinks)) { + mpage->mlinks = mlink->next; + mlink_free(mlink); + } free(mpage->sec); - free(mpage->dsec); free(mpage->arch); + free(mpage->title); + free(mpage->desc); free(mpage); + mpage = ohash_next(&mpages, &slot); } } /* - * Run through the files in the global vector "mpages_list" and add them to the - * database specified in "basedir". + * For each mlink to the mpage, check whether the path looks like + * it is formatted, and if it does, check whether a source manual + * exists by the same name, ignoring the suffix. + * If both conditions hold, drop the mlink. + */ +static void +mlinks_undupe(struct mpage *mpage) +{ + char buf[PATH_MAX]; + struct mlink **prev; + struct mlink *mlink; + char *bufp; + + mpage->form = FORM_CAT; + prev = &mpage->mlinks; + while (NULL != (mlink = *prev)) { + if (FORM_CAT != mlink->dform) { + mpage->form = FORM_NONE; + goto nextlink; + } + if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) { + if (warnings) + say(mlink->file, "Filename too long"); + goto nextlink; + } + bufp = strstr(buf, "cat"); + assert(NULL != bufp); + memcpy(bufp, "man", 3); + if (NULL != (bufp = strrchr(buf, '.'))) + *++bufp = '\0'; + strlcat(buf, mlink->dsec, PATH_MAX); + if (NULL == ohash_find(&mlinks, + ohash_qlookup(&mlinks, buf))) + goto nextlink; + if (warnings) + say(mlink->file, "Man source exists: %s", buf); + if (use_all) + goto nextlink; + *prev = mlink->next; + mlink_free(mlink); + continue; +nextlink: + prev = &(*prev)->next; + } +} + +/* + * Run through the files in the global vector "mpages" + * and add them to the database specified in "basedir". * * This handles the parsing scheme itself, using the cues of directory * and filename to determine whether the file is parsable or not. @@ -891,17 +899,14 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int { struct ohash title_table; struct ohash_info title_info, str_info; - char buf[PATH_MAX]; struct mpage *mpage; struct mdoc *mdoc; struct man *man; struct title *title_entry; - char *bufp, *title_str; - const char *msec, *march, *mtitle, *cp; - size_t sz; - int form; + char *title_str; + const char *cp; int match; - unsigned int slot; + unsigned int pslot, tslot; enum mandoclevel lvl; str_info.alloc = hash_alloc; @@ -917,34 +922,12 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int ohash_init(&title_table, 6, &title_info); } - for (mpage = mpages_list; NULL != mpage; mpage = mpage->next) { - /* - * If we're a catpage (as defined by our path), then see - * if a manpage exists by the same name (ignoring the - * suffix). - * If it does, then we want to use it instead of our - * own. - */ - if ( ! use_all && FORM_CAT == mpage->dform) { - sz = strlcpy(buf, mpage->file, PATH_MAX); - if (sz >= PATH_MAX) { - if (warnings) - say(mpage->file, - "Filename too long"); - continue; - } - bufp = strstr(buf, "cat"); - assert(NULL != bufp); - memcpy(bufp, "man", 3); - if (NULL != (bufp = strrchr(buf, '.'))) - *++bufp = '\0'; - strlcat(buf, mpage->dsec, PATH_MAX); - if (filecheck(buf)) { - if (warnings) - say(mpage->file, "Man " - "source exists: %s", buf); - continue; - } + mpage = ohash_first(&mpages, &pslot); + while (NULL != mpage) { + mlinks_undupe(mpage); + if (NULL == mpage->mlinks) { + mpage = ohash_next(&mpages, &pslot); + continue; } ohash_init(&strings, 6, &str_info); @@ -958,36 +941,40 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int * source code, unless it is already known to be * formatted. Fall back to formatted mode. */ - if (FORM_CAT != mpage->dform || FORM_CAT != mpage->sform) { - lvl = mparse_readfd(mp, -1, mpage->file); + if (FORM_CAT != mpage->mlinks->dform || + FORM_CAT != mpage->mlinks->fform) { + lvl = mparse_readfd(mp, -1, mpage->mlinks->file); if (lvl < MANDOCLEVEL_FATAL) mparse_result(mp, &mdoc, &man); } if (NULL != mdoc) { - form = 1; - msec = mdoc_meta(mdoc)->msec; - march = mdoc_meta(mdoc)->arch; - mtitle = mdoc_meta(mdoc)->title; + mpage->form = FORM_SRC; + mpage->sec = + mandoc_strdup(mdoc_meta(mdoc)->msec); + mpage->arch = mdoc_meta(mdoc)->arch; + mpage->arch = mandoc_strdup( + NULL == mpage->arch ? "" : mpage->arch); + mpage->title = + mandoc_strdup(mdoc_meta(mdoc)->title); } else if (NULL != man) { - form = 1; - msec = man_meta(man)->msec; - march = mpage->arch; - mtitle = man_meta(man)->title; + mpage->form = FORM_SRC; + mpage->sec = + mandoc_strdup(man_meta(man)->msec); + mpage->arch = + mandoc_strdup(mpage->mlinks->arch); + mpage->title = + mandoc_strdup(man_meta(man)->title); } else { - form = 0; - msec = mpage->dsec; - march = mpage->arch; - mtitle = mpage->name; + mpage->form = FORM_CAT; + mpage->sec = + mandoc_strdup(mpage->mlinks->dsec); + mpage->arch = + mandoc_strdup(mpage->mlinks->arch); + mpage->title = + mandoc_strdup(mpage->mlinks->name); } - if (NULL == msec) - msec = ""; - if (NULL == march) - march = ""; - if (NULL == mtitle) - mtitle = ""; - /* * Check whether the manual section given in a file * agrees with the directory where the file is located. @@ -997,12 +984,12 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int * section, like encrypt(1) = makekey(8). Do not skip * manuals for such reasons. */ - if (warnings && !use_all && form && - strcasecmp(msec, mpage->dsec)) { + if (warnings && !use_all && FORM_SRC == mpage->form && + strcasecmp(mpage->sec, mpage->mlinks->dsec)) { match = 0; - say(mpage->file, "Section \"%s\" " + say(mpage->mlinks->file, "Section \"%s\" " "manual in %s directory", - msec, mpage->dsec); + mpage->sec, mpage->mlinks->dsec); } /* @@ -1019,16 +1006,18 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int * Thus, warn about architecture mismatches, * but don't skip manuals for this reason. */ - if (warnings && !use_all && strcasecmp(march, mpage->arch)) { + if (warnings && !use_all && + strcasecmp(mpage->arch, mpage->mlinks->arch)) { match = 0; - say(mpage->file, "Architecture \"%s\" " + say(mpage->mlinks->file, "Architecture \"%s\" " "manual in \"%s\" directory", - march, mpage->arch); + mpage->arch, mpage->mlinks->arch); } - if (warnings && !use_all && strcasecmp(mtitle, mpage->name)) + if (warnings && !use_all && + strcasecmp(mpage->title, mpage->mlinks->name)) match = 0; - putkey(mpage, mpage->name, TYPE_Nm); + putkey(mpage, mpage->mlinks->name, TYPE_Nm); if (NULL != mdoc) { if (NULL != (cp = mdoc_meta(mdoc)->name)) @@ -1036,7 +1025,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int assert(NULL == mpage->desc); parse_mdoc(mpage, mdoc_node(mdoc)); putkey(mpage, NULL != mpage->desc ? - mpage->desc : mpage->name, TYPE_Nd); + mpage->desc : mpage->mlinks->name, TYPE_Nd); } else if (NULL != man) parse_man(mpage, man_node(man)); else @@ -1049,20 +1038,22 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int */ if (check_reachable) { - if (-1 == asprintf(&title_str, "%s(%s%s%s)", mtitle, - msec, '\0' == *march ? "" : "/", march)) { + if (-1 == asprintf(&title_str, "%s(%s%s%s)", + mpage->title, mpage->sec, + '\0' == *mpage->arch ? "" : "/", + mpage->arch)) { perror(NULL); exit((int)MANDOCLEVEL_SYSERR); } - slot = ohash_qlookup(&title_table, title_str); - title_entry = ohash_find(&title_table, slot); + tslot = ohash_qlookup(&title_table, title_str); + title_entry = ohash_find(&title_table, tslot); if (NULL == title_entry) { title_entry = mandoc_malloc( sizeof(struct title)); title_entry->title = title_str; title_entry->file = mandoc_strdup( - match ? "" : mpage->file); - ohash_insert(&title_table, slot, + match ? "" : mpage->mlinks->file); + ohash_insert(&title_table, tslot, title_entry); } else { if (match) @@ -1071,12 +1062,13 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int } } - dbindex(mc, form, mpage); + dbindex(mpage, mc); ohash_delete(&strings); + mpage = ohash_next(&mpages, &pslot); } if (check_reachable) { - title_entry = ohash_first(&title_table, &slot); + title_entry = ohash_first(&title_table, &tslot); while (NULL != title_entry) { if ('\0' != *title_entry->file) say(title_entry->file, @@ -1085,7 +1077,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int free(title_entry->title); free(title_entry->file); free(title_entry); - title_entry = ohash_next(&title_table, &slot); + title_entry = ohash_next(&title_table, &tslot); } ohash_delete(&title_table); } @@ -1098,9 +1090,9 @@ parse_cat(struct mpage *mpage) char *line, *p, *title; size_t len, plen, titlesz; - if (NULL == (stream = fopen(mpage->file, "r"))) { + if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) { if (warnings) - say(mpage->file, NULL); + say(mpage->mlinks->file, NULL); return; } @@ -1153,10 +1145,11 @@ parse_cat(struct mpage *mpage) if (NULL == title || '\0' == *title) { if (warnings) - say(mpage->file, "Cannot find NAME section"); + say(mpage->mlinks->file, + "Cannot find NAME section"); assert(NULL == mpage->desc); - mpage->desc = mandoc_strdup(mpage->name); - putkey(mpage, mpage->name, TYPE_Nd); + mpage->desc = mandoc_strdup(mpage->mlinks->name); + putkey(mpage, mpage->mlinks->name, TYPE_Nd); fclose(stream); free(title); return; @@ -1176,7 +1169,8 @@ parse_cat(struct mpage *mpage) /* Skip to next word. */ ; } else { if (warnings) - say(mpage->file, "No dash in title line"); + say(mpage->mlinks->file, + "No dash in title line"); p = title; } @@ -1786,8 +1780,9 @@ utf8key(struct mchars *mc, struct str *key) * Also, UTF-8-encode the description at the last possible moment. */ static void -dbindex(struct mchars *mc, int form, const struct mpage *mpage) +dbindex(const struct mpage *mpage, struct mchars *mc) { + struct mlink *mlink; struct str *key; const char *desc; int64_t recno; @@ -1795,7 +1790,7 @@ dbindex(struct mchars *mc, int form, const struct mpag unsigned int slot; if (verb) - say(mpage->file, "Adding to index"); + say(mpage->mlinks->file, "Adding to index"); if (nodb) return; @@ -1813,15 +1808,31 @@ dbindex(struct mchars *mc, int form, const struct mpag SQL_EXEC("BEGIN TRANSACTION"); i = 1; - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->file); - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->sec); - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->arch); - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, desc); - SQL_BIND_INT(stmts[STMT_INSERT_DOC], i, form); - SQL_STEP(stmts[STMT_INSERT_DOC]); + /* + * XXX The following three lines are obsolete + * and only kept for backward compatibility + * until apropos(1) and friends have caught up. + */ + SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->file); + SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->dsec); + SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->arch); + SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc); + SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); + SQL_STEP(stmts[STMT_INSERT_PAGE]); recno = sqlite3_last_insert_rowid(db); - sqlite3_reset(stmts[STMT_INSERT_DOC]); + sqlite3_reset(stmts[STMT_INSERT_PAGE]); + 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_INT64(stmts[STMT_INSERT_LINK], i, recno); + SQL_STEP(stmts[STMT_INSERT_LINK]); + sqlite3_reset(stmts[STMT_INSERT_LINK]); + } + for (key = ohash_first(&strings, &slot); NULL != key; key = ohash_next(&strings, &slot)) { assert(key->mpage == mpage); @@ -1845,18 +1856,23 @@ static void dbprune(void) { struct mpage *mpage; + struct mlink *mlink; size_t i; + unsigned int slot; if (nodb) return; - for (mpage = mpages_list; NULL != mpage; mpage = mpage->next) { + mpage = ohash_first(&mpages, &slot); + while (NULL != mpage) { + mlink = mpage->mlinks; i = 1; - SQL_BIND_TEXT(stmts[STMT_DELETE], i, mpage->file); - SQL_STEP(stmts[STMT_DELETE]); - sqlite3_reset(stmts[STMT_DELETE]); + SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file); + SQL_STEP(stmts[STMT_DELETE_PAGE]); + sqlite3_reset(stmts[STMT_DELETE_PAGE]); if (verb) - say(mpage->file, "Deleted from index"); + say(mlink->file, "Deleted from index"); + mpage = ohash_next(&mpages, &slot); } } @@ -1936,7 +1952,12 @@ dbopen(int real) return(0); } - sql = "CREATE TABLE \"docs\" (\n" + /* + * XXX The first three columns in table mpages are obsolete + * and only kept for backward compatibility + * until apropos(1) and friends have caught up. + */ + sql = "CREATE TABLE \"mpages\" (\n" " \"file\" TEXT NOT NULL,\n" " \"sec\" TEXT NOT NULL,\n" " \"arch\" TEXT NOT NULL,\n" @@ -1945,11 +1966,21 @@ dbopen(int real) " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\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) " + "ON DELETE CASCADE,\n" + " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" + ");\n" + "\n" "CREATE TABLE \"keys\" (\n" " \"bits\" INTEGER NOT NULL,\n" " \"key\" TEXT NOT NULL,\n" - " \"docid\" INTEGER NOT NULL REFERENCES docs(id) " - "ON DELETE CASCADE,\n" + " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " + "ON DELETE CASCADE,\n" " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" ");\n" "\n" @@ -1963,13 +1994,16 @@ dbopen(int real) prepare_statements: SQL_EXEC("PRAGMA foreign_keys = ON"); - sql = "DELETE FROM docs where file=?"; - sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE], NULL); - sql = "INSERT INTO docs " + sql = "DELETE FROM mpages where file=?"; + sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL); + sql = "INSERT INTO mpages " "(file,sec,arch,desc,form) VALUES (?,?,?,?,?)"; - sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_DOC], NULL); + sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL); + sql = "INSERT INTO mlinks " + "(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)"; + sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL); sql = "INSERT INTO keys " - "(bits,key,docid) VALUES (?,?,?)"; + "(bits,key,pageid) VALUES (?,?,?)"; sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL); #ifndef __APPLE__