=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.71 retrieving revision 1.100 diff -u -p -r1.71 -r1.100 --- mandoc/mandocdb.c 2013/07/02 13:26:52 1.71 +++ mandoc/mandocdb.c 2014/01/05 04:13:52 1.100 @@ -1,7 +1,7 @@ -/* $Id: mandocdb.c,v 1.71 2013/07/02 13:26:52 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.100 2014/01/05 04:13:52 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons - * Copyright (c) 2011, 2012, 2013 Ingo Schwarze + * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -76,34 +76,42 @@ 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 { - char *utf8; /* key in UTF-8 form */ - const struct of *of; /* if set, the owning parse */ + char *rendered; /* key in UTF-8 or ASCII form */ + const struct mpage *mpage; /* if set, the owning parse */ uint64_t mask; /* bitmask in sequence */ - char key[]; /* the string itself */ + char key[]; /* may contain escape sequences */ }; -struct id { - ino_t ino; - dev_t dev; +struct inodev { + ino_t st_ino; + dev_t st_dev; }; -struct of { - struct id id; /* used for hashing routine */ - struct of *next; /* next in ofs */ - enum form dform; /* path-cued form */ - enum form sform; /* suffix-cued form */ +struct mpage { + struct inodev inodev; /* used for hashing routine */ + 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,13 +120,14 @@ 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 }; -typedef int (*mdoc_fp)(struct of *, const struct mdoc_node *); +typedef int (*mdoc_fp)(struct mpage *, const struct mdoc_node *); struct mdoc_handler { mdoc_fp fp; /* optional handler */ @@ -126,58 +135,54 @@ struct mdoc_handler { }; static void dbclose(int); -static void dbindex(struct mchars *, int, const struct of *); +static void dbindex(const struct mpage *, struct mchars *); static int dbopen(int); static void dbprune(void); -static void fileadd(struct of *); -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 of *); -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 *, int); -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 *); -static int parse_mdoc_body(struct of *, const struct mdoc_node *); -static int parse_mdoc_head(struct of *, const struct mdoc_node *); -static int parse_mdoc_Fd(struct of *, const struct mdoc_node *); -static int parse_mdoc_Fn(struct of *, const struct mdoc_node *); -static int parse_mdoc_In(struct of *, const struct mdoc_node *); -static int parse_mdoc_Nd(struct of *, const struct mdoc_node *); -static int parse_mdoc_Nm(struct of *, const struct mdoc_node *); -static int parse_mdoc_Sh(struct of *, const struct mdoc_node *); -static int parse_mdoc_St(struct of *, const struct mdoc_node *); -static int parse_mdoc_Xr(struct of *, const struct mdoc_node *); -static int set_basedir(const char *); -static void putkey(const struct of *, +static void mlink_add(struct mlink *, const struct stat *); +static int mlink_check(struct mpage *, struct mlink *); +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 *); +static void parse_man(struct mpage *, const struct man_node *); +static void parse_mdoc(struct mpage *, const struct mdoc_node *); +static int parse_mdoc_body(struct mpage *, const struct mdoc_node *); +static int parse_mdoc_head(struct mpage *, const struct mdoc_node *); +static int parse_mdoc_Fd(struct mpage *, const struct mdoc_node *); +static int parse_mdoc_Fn(struct mpage *, const struct mdoc_node *); +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 void putkey(const struct mpage *, const char *, uint64_t); -static void putkeys(const struct of *, +static void putkeys(const struct mpage *, const char *, size_t, uint64_t); -static void putmdockey(const struct of *, +static void putmdockey(const struct mpage *, const struct mdoc_node *, uint64_t); +static void render_key(struct mchars *, struct str *); 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 *); static char *progname; static int use_all; /* use all found files */ static int nodb; /* no database changes */ static int verb; /* print what we're doing */ static int warnings; /* warn about crap */ +static int write_utf8; /* write UTF-8 output; else ASCII */ 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 inos; /* table of inodes/devices */ -static struct ohash filenames; /* table of filenames */ +static struct ohash mpages; /* table of distinct manual pages */ +static struct ohash mlinks; /* table of directory entries */ static struct ohash strings; /* table of all strings */ -static struct of *ofs = NULL; /* vector of files to parse */ static sqlite3 *db = NULL; /* current database */ static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ @@ -211,7 +216,7 @@ static const struct mdoc_handler mdocs[MDOC_MAX] = { { parse_mdoc_Fn, 0 }, /* Fn */ { NULL, TYPE_Ft }, /* Ft */ { NULL, TYPE_Ic }, /* Ic */ - { parse_mdoc_In, TYPE_In }, /* In */ + { NULL, TYPE_In }, /* In */ { NULL, TYPE_Li }, /* Li */ { parse_mdoc_Nd, TYPE_Nd }, /* Nd */ { parse_mdoc_Nm, TYPE_Nm }, /* Nm */ @@ -219,7 +224,7 @@ static const struct mdoc_handler mdocs[MDOC_MAX] = { { NULL, 0 }, /* Ot */ { NULL, TYPE_Pa }, /* Pa */ { NULL, 0 }, /* Rv */ - { parse_mdoc_St, 0 }, /* St */ + { NULL, TYPE_St }, /* St */ { NULL, TYPE_Va }, /* Va */ { parse_mdoc_body, TYPE_Va }, /* Vt */ { parse_mdoc_Xr, 0 }, /* Xr */ @@ -315,17 +320,17 @@ main(int argc, char *argv[]) struct mchars *mc; struct manpaths dirs; struct mparse *mp; - struct ohash_info ino_info, filename_info; + struct ohash_info mpages_info, mlinks_info; memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); memset(&dirs, 0, sizeof(struct manpaths)); - ino_info.alloc = filename_info.alloc = hash_alloc; - ino_info.halloc = filename_info.halloc = hash_halloc; - ino_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; - ino_info.key_offset = offsetof(struct of, id); - filename_info.key_offset = offsetof(struct of, file); + mpages_info.key_offset = offsetof(struct mpage, inodev); + mlinks_info.key_offset = offsetof(struct mlink, file); progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -347,7 +352,7 @@ main(int argc, char *argv[]) path_arg = NULL; op = OP_DEFAULT; - while (-1 != (ch = getopt(argc, argv, "aC:d:ntu:vW"))) + while (-1 != (ch = getopt(argc, argv, "aC:d:nT:tu:vW"))) switch (ch) { case ('a'): use_all = 1; @@ -365,6 +370,14 @@ main(int argc, char *argv[]) case ('n'): nodb = 1; break; + case ('T'): + if (strcmp(optarg, "utf8")) { + fprintf(stderr, "-T%s: Unsupported " + "output format\n", optarg); + goto usage; + } + write_utf8 = 1; + break; case ('t'): CHECKOP(op, ch); dup2(STDOUT_FILENO, STDERR_FILENO); @@ -399,8 +412,8 @@ main(int argc, char *argv[]) MANDOCLEVEL_FATAL, NULL, NULL, NULL); mc = mchars_alloc(); - ohash_init(&inos, 6, &ino_info); - ohash_init(&filenames, 6, &filename_info); + ohash_init(&mpages, 6, &mpages_info); + ohash_init(&mlinks, 6, &mlinks_info); if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { /* @@ -422,7 +435,7 @@ main(int argc, char *argv[]) if (OP_TEST != op) dbprune(); if (OP_DELETE != op) - ofmerge(mc, mp, 0); + mpages_merge(mc, mp, 0); dbclose(1); } else { /* @@ -453,8 +466,8 @@ main(int argc, char *argv[]) continue; if (j) { - ohash_init(&inos, 6, &ino_info); - ohash_init(&filenames, 6, &filename_info); + ohash_init(&mpages, 6, &mpages_info); + ohash_init(&mlinks, 6, &mlinks_info); } if (0 == set_basedir(dirs.paths[j])) @@ -466,13 +479,13 @@ main(int argc, char *argv[]) if (0 == dbopen(0)) goto out; - ofmerge(mc, mp, warnings && !use_all); + mpages_merge(mc, mp, warnings && !use_all); dbclose(0); if (j + 1 < dirs.sz) { - ohash_delete(&inos); - ohash_delete(&filenames); - offree(); + mpages_free(); + ohash_delete(&mpages); + ohash_delete(&mlinks); } } } @@ -481,14 +494,14 @@ out: manpath_free(&dirs); mchars_free(mc); mparse_free(mp); - ohash_delete(&inos); - ohash_delete(&filenames); - offree(); + mpages_free(); + ohash_delete(&mpages); + ohash_delete(&mlinks); return(exitcode); usage: - fprintf(stderr, "usage: %s [-anvW] [-C file]\n" - " %s [-anvW] dir ...\n" - " %s [-nvW] -d dir [file ...]\n" + fprintf(stderr, "usage: %s [-anvW] [-C file] [-Tutf8]\n" + " %s [-anvW] [-Tutf8] dir ...\n" + " %s [-nvW] [-Tutf8] -d dir [file ...]\n" " %s [-nvW] -u dir [file ...]\n" " %s -t file ...\n", progname, progname, progname, @@ -516,9 +529,10 @@ treescan(void) { FTS *f; FTSENT *ff; + struct mlink *mlink; int dform; - char *sec; - const char *dsec, *arch, *cp, *path; + char *dsec, *arch, *fsec, *cp; + const char *path; const char *argv[2]; argv[0] = "."; @@ -541,9 +555,8 @@ treescan(void) while (NULL != (ff = fts_read(f))) { path = ff->fts_path + 2; /* - * If we're a regular file, add an "of" 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 +565,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 +573,41 @@ 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; + mlink->dsec = dsec; + mlink->arch = arch; + mlink->name = ff->fts_name; + mlink->fsec = 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"); @@ -608,8 +624,6 @@ treescan(void) * Try to infer this from the name. * If we're not in use_all, enforce it. */ - dsec = NULL; - dform = FORM_NONE; cp = ff->fts_name; if (FTS_DP == ff->fts_info) break; @@ -620,6 +634,9 @@ treescan(void) } else if (0 == strncmp(cp, "cat", 3)) { dform = FORM_CAT; dsec = cp + 3; + } else { + dform = FORM_NONE; + dsec = NULL; } if (NULL != dsec || use_all) @@ -634,9 +651,10 @@ treescan(void) * Possibly our architecture. * If we're descending, keep tabs on it. */ - arch = NULL; if (FTS_DP != ff->fts_info && NULL != dsec) arch = ff->fts_name; + else + arch = NULL; break; default: if (FTS_DP == ff->fts_info || use_all) @@ -653,7 +671,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 +682,15 @@ treescan(void) * or * [./]cat
[/]/.0 * - * Stuff this information directly into the "of" 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); @@ -685,7 +701,7 @@ filescan(const char *file) exitcode = (int)MANDOCLEVEL_BADARG; say(file, NULL); return; - } else if (strstr(buf, basedir) != buf) { + } else if (OP_TEST != op && strstr(buf, basedir) != buf) { exitcode = (int)MANDOCLEVEL_BADARG; say("", "%s: outside base directory", buf); return; @@ -697,14 +713,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 +727,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 = start + 3; } else if (0 == strncmp(start, "cat", 3)) { - dform = FORM_CAT; - dsec = start + 3; + mlink->dform = FORM_CAT; + mlink->dsec = 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 = start; start = p; - } + } } /* @@ -740,168 +752,212 @@ filescan(const char *file) if ('.' == *p) { *p++ = '\0'; - sec = p; + mlink->fsec = 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'; - } - - ofadd(dform, file, name, dsec, sec, arch, &st); + } + mlink_add(mlink, &st); } -/* - * See fileadd(). - */ -static int -filecheck(const char *name) +static void +mlink_add(struct mlink *mlink, const struct stat *st) { + struct inodev inodev; + struct mpage *mpage; + unsigned int slot; - return(NULL != ohash_find(&filenames, - ohash_qlookup(&filenames, name))); + assert(NULL != mlink->file); + + mlink->dsec = mandoc_strdup(mlink->dsec ? mlink->dsec : ""); + mlink->arch = mandoc_strdup(mlink->arch ? mlink->arch : ""); + mlink->name = mandoc_strdup(mlink->name ? mlink->name : ""); + mlink->fsec = mandoc_strdup(mlink->fsec ? mlink->fsec : ""); + + 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; + + slot = ohash_qlookup(&mlinks, mlink->file); + assert(NULL == ohash_find(&mlinks, slot)); + ohash_insert(&mlinks, slot, mlink); + + 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; } -/* - * Use the standard hashing mechanism (K&R) to see if the given filename - * already exists. - */ static void -fileadd(struct of *of) +mlink_free(struct mlink *mlink) { - unsigned int slot; - slot = ohash_qlookup(&filenames, of->file); - assert(NULL == ohash_find(&filenames, slot)); - ohash_insert(&filenames, slot, of); + free(mlink->dsec); + free(mlink->arch); + free(mlink->name); + free(mlink->fsec); + free(mlink); } -/* - * See inoadd(). - */ -static int -inocheck(const struct stat *st) +static void +mpages_free(void) { - struct id id; - uint32_t hash; + struct mpage *mpage; + struct mlink *mlink; + unsigned int slot; - memset(&id, 0, sizeof(id)); - id.ino = hash = st->st_ino; - id.dev = st->st_dev; - - return(NULL != ohash_find(&inos, ohash_lookup_memory( - &inos, (char *)&id, sizeof(id), hash))); + 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->arch); + free(mpage->title); + free(mpage->desc); + free(mpage); + mpage = ohash_next(&mpages, &slot); + } } /* - * 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. + * 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 -inoadd(const struct stat *st, struct of *of) +mlinks_undupe(struct mpage *mpage) { - uint32_t hash; - unsigned int slot; + char buf[PATH_MAX]; + struct mlink **prev; + struct mlink *mlink; + char *bufp; - of->id.ino = hash = st->st_ino; - of->id.dev = st->st_dev; - slot = ohash_lookup_memory - (&inos, (char *)&of->id, sizeof(of->id), hash); - - assert(NULL == ohash_find(&inos, slot)); - ohash_insert(&inos, slot, of); + 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; + } } -static void -ofadd(int dform, const char *file, const char *name, const char *dsec, - const char *sec, const char *arch, const struct stat *st) +static int +mlink_check(struct mpage *mpage, struct mlink *mlink) { - struct of *of; - int sform; + int match; - assert(NULL != file); + match = 1; - if (NULL == name) - name = ""; - if (NULL == sec) - sec = ""; - if (NULL == dsec) - dsec = ""; - if (NULL == arch) - arch = ""; + /* + * Check whether the manual section given in a file + * agrees with the directory where the file is located. + * Some manuals have suffixes like (3p) on their + * section number either inside the file or in the + * directory name, some are linked into more than one + * section, like encrypt(1) = makekey(8). + */ - sform = FORM_NONE; - if (NULL != sec && *sec <= '9' && *sec >= '1') - sform = FORM_SRC; - else if (NULL != sec && *sec == '0') { - sec = dsec; - sform = FORM_CAT; + if (FORM_SRC == mpage->form && + strcasecmp(mpage->sec, mlink->dsec)) { + match = 0; + say(mlink->file, "Section \"%s\" manual in %s directory", + mpage->sec, mlink->dsec); } - of = mandoc_calloc(1, sizeof(struct of)); - strlcpy(of->file, file, PATH_MAX); - 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; - ofs = of; - /* - * 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. + * Manual page directories exist for each kernel + * architecture as returned by machine(1). + * However, many manuals only depend on the + * application architecture as returned by arch(1). + * For example, some (2/ARM) manuals are shared + * across the "armish" and "zaurus" kernel + * architectures. + * A few manuals are even shared across completely + * different architectures, for example fdformat(1) + * on amd64, i386, sparc, and sparc64. */ - inoadd(st, of); - fileadd(of); -} -static void -offree(void) -{ - struct of *of; - - while (NULL != (of = ofs)) { - ofs = of->next; - free(of->name); - free(of->sec); - free(of->dsec); - free(of->arch); - free(of); + if (strcasecmp(mpage->arch, mlink->arch)) { + match = 0; + say(mlink->file, "Architecture \"%s\" manual in " + "\"%s\" directory", mpage->arch, mlink->arch); } + + if (strcasecmp(mpage->title, mlink->name)) + match = 0; + + return(match); } /* - * Run through the files in the global vector "ofs" and add them to the - * database specified in "basedir". + * 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. */ static void -ofmerge(struct mchars *mc, struct mparse *mp, int check_reachable) +mpages_merge(struct mchars *mc, struct mparse *mp, int check_reachable) { struct ohash title_table; struct ohash_info title_info, str_info; - char buf[PATH_MAX]; - struct of *of; + struct mpage *mpage; + struct mlink *mlink; 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,128 +973,91 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec ohash_init(&title_table, 6, &title_info); } - for (of = ofs; NULL != of; of = of->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 == of->dform) { - sz = strlcpy(buf, of->file, PATH_MAX); - if (sz >= PATH_MAX) { - if (warnings) - say(of->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, of->dsec, PATH_MAX); - if (filecheck(buf)) { - if (warnings) - say(of->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); mparse_reset(mp); mdoc = NULL; man = NULL; - form = 0; - msec = of->dsec; - march = of->arch; - mtitle = of->name; - match = 1; /* * Try interpreting the file as mdoc(7) or man(7) * source code, unless it is already known to be * formatted. Fall back to formatted mode. */ - if (FORM_SRC == of->dform || FORM_SRC == of->sform) { - lvl = mparse_readfd(mp, -1, of->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 = ""; - 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 { + 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); + } + putkey(mpage, mpage->sec, TYPE_sec); + putkey(mpage, '\0' == *mpage->arch ? + "any" : mpage->arch, TYPE_arch); - 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. - * Some manuals have suffixes like (3p) on their - * section number either inside the file or in the - * directory name, some are linked into more than one - * section, like encrypt(1) = makekey(8). Do not skip - * manuals for such reasons. - */ - if (warnings && !use_all && form && - strcasecmp(msec, of->dsec)) { - match = 0; - say(of->file, "Section \"%s\" " - "manual in %s directory", - msec, of->dsec); + for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { + if ('\0' != *mlink->dsec) + putkey(mpage, mlink->dsec, TYPE_sec); + if ('\0' != *mlink->fsec) + putkey(mpage, mlink->fsec, TYPE_sec); + putkey(mpage, '\0' == *mlink->arch ? + "any" : mlink->arch, TYPE_arch); + putkey(mpage, mlink->name, TYPE_Nm); } - /* - * Manual page directories exist for each kernel - * architecture as returned by machine(1). - * However, many manuals only depend on the - * application architecture as returned by arch(1). - * For example, some (2/ARM) manuals are shared - * across the "armish" and "zaurus" kernel - * architectures. - * A few manuals are even shared across completely - * different architectures, for example fdformat(1) - * on amd64, i386, sparc, and sparc64. - * Thus, warn about architecture mismatches, - * but don't skip manuals for this reason. - */ - if (warnings && !use_all && strcasecmp(march, of->arch)) { + if (warnings && !use_all) { match = 0; - say(of->file, "Architecture \"%s\" " - "manual in \"%s\" directory", - march, of->arch); - } - if (warnings && !use_all && strcasecmp(mtitle, of->name)) - match = 0; + for (mlink = mpage->mlinks; mlink; + mlink = mlink->next) + if (mlink_check(mpage, mlink)) + match = 1; + } else + match = 1; - putkey(of, of->name, TYPE_Nm); - 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); + putkey(mpage, cp, TYPE_Nm); + assert(NULL == mpage->desc); + parse_mdoc(mpage, mdoc_node(mdoc)); + putkey(mpage, NULL != mpage->desc ? + mpage->desc : mpage->mlinks->name, TYPE_Nd); } else if (NULL != man) - parse_man(of, man_node(man)); + parse_man(mpage, man_node(man)); else - parse_catpage(of); + parse_cat(mpage); /* * Build a title string for the file. If it matches @@ -1047,20 +1066,22 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec */ 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 ? "" : of->file); - ohash_insert(&title_table, slot, + match ? "" : mpage->mlinks->file); + ohash_insert(&title_table, tslot, title_entry); } else { if (match) @@ -1069,12 +1090,13 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec } } - dbindex(mc, form, of); + 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, @@ -1083,22 +1105,22 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec 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); } } static void -parse_catpage(struct of *of) +parse_cat(struct mpage *mpage) { FILE *stream; char *line, *p, *title; size_t len, plen, titlesz; - if (NULL == (stream = fopen(of->file, "r"))) { + if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) { if (warnings) - say(of->file, NULL); + say(mpage->mlinks->file, NULL); return; } @@ -1151,10 +1173,11 @@ 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); + say(mpage->mlinks->file, + "Cannot find NAME section"); + assert(NULL == mpage->desc); + mpage->desc = mandoc_strdup(mpage->mlinks->name); + putkey(mpage, mpage->mlinks->name, TYPE_Nd); fclose(stream); free(title); return; @@ -1174,7 +1197,8 @@ parse_catpage(struct of *of) /* Skip to next word. */ ; } else { if (warnings) - say(of->file, "No dash in title line"); + say(mpage->mlinks->file, + "No dash in title line"); p = title; } @@ -1192,9 +1216,9 @@ parse_catpage(struct of *of) plen -= 2; } - assert(NULL == of->desc); - of->desc = mandoc_strdup(p); - putkey(of, of->desc, TYPE_Nd); + assert(NULL == mpage->desc); + mpage->desc = mandoc_strdup(p); + putkey(mpage, mpage->desc, TYPE_Nd); fclose(stream); free(title); } @@ -1203,30 +1227,31 @@ parse_catpage(struct of *of) * Put a type/word pair into the word database for this particular file. */ static void -putkey(const struct of *of, const char *value, uint64_t type) +putkey(const struct mpage *mpage, const char *value, uint64_t type) { assert(NULL != value); - putkeys(of, value, strlen(value), type); + putkeys(mpage, value, strlen(value), type); } /* * Grok all nodes at or below a certain mdoc node into putkey(). */ static void -putmdockey(const struct of *of, const struct mdoc_node *n, uint64_t m) +putmdockey(const struct mpage *mpage, + const struct mdoc_node *n, uint64_t m) { for ( ; NULL != n; n = n->next) { if (NULL != n->child) - putmdockey(of, n->child, m); + putmdockey(mpage, n->child, m); if (MDOC_TEXT == n->type) - putkey(of, n->string, m); + putkey(mpage, n->string, m); } } static void -parse_man(struct of *of, const struct man_node *n) +parse_man(struct mpage *mpage, const struct man_node *n) { const struct man_node *head, *body; char *start, *sv, *title; @@ -1321,7 +1346,7 @@ parse_man(struct of *of, const struct man_node *n) byte = start[sz]; start[sz] = '\0'; - putkey(of, start, TYPE_Nm); + putkey(mpage, start, TYPE_Nm); if (' ' == byte) { start += sz + 1; @@ -1335,7 +1360,7 @@ parse_man(struct of *of, const struct man_node *n) } if (sv == start) { - putkey(of, start, TYPE_Nm); + putkey(mpage, start, TYPE_Nm); free(title); return; } @@ -1357,20 +1382,23 @@ parse_man(struct of *of, const struct man_node *n) while (' ' == *start) start++; - assert(NULL == of->desc); - of->desc = mandoc_strdup(start); - putkey(of, of->desc, TYPE_Nd); + assert(NULL == mpage->desc); + mpage->desc = mandoc_strdup(start); + putkey(mpage, mpage->desc, TYPE_Nd); free(title); return; } } - for (n = n->child; n; n = n->next) - parse_man(of, n); + for (n = n->child; n; n = n->next) { + if (NULL != mpage->desc) + break; + parse_man(mpage, n); + } } static void -parse_mdoc(struct of *of, const struct mdoc_node *n) +parse_mdoc(struct mpage *mpage, const struct mdoc_node *n) { assert(NULL != n); @@ -1386,22 +1414,23 @@ parse_mdoc(struct of *of, const struct mdoc_node *n) /* FALLTHROUGH */ case (MDOC_TAIL): if (NULL != mdocs[n->tok].fp) - if (0 == (*mdocs[n->tok].fp)(of, n)) + if (0 == (*mdocs[n->tok].fp)(mpage, n)) break; if (mdocs[n->tok].mask) - putmdockey(of, n->child, mdocs[n->tok].mask); + putmdockey(mpage, n->child, + mdocs[n->tok].mask); break; default: assert(MDOC_ROOT != n->type); continue; } if (NULL != n->child) - parse_mdoc(of, n); + parse_mdoc(mpage, n); } } static int -parse_mdoc_Fd(struct of *of, const struct mdoc_node *n) +parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n) { const char *start, *end; size_t sz; @@ -1439,24 +1468,13 @@ parse_mdoc_Fd(struct of *of, const struct mdoc_node *n end--; if (end > start) - putkeys(of, start, end - start + 1, TYPE_In); - return(1); + putkeys(mpage, start, end - start + 1, TYPE_In); + return(0); } static int -parse_mdoc_In(struct of *of, const struct mdoc_node *n) +parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n) { - - if (NULL != n->child && MDOC_TEXT == n->child->type) - return(0); - - putkey(of, n->child->string, TYPE_In); - return(1); -} - -static int -parse_mdoc_Fn(struct of *of, const struct mdoc_node *n) -{ const char *cp; if (NULL == (n = n->child) || MDOC_TEXT != n->type) @@ -1475,39 +1493,28 @@ parse_mdoc_Fn(struct of *of, const struct mdoc_node *n while ('*' == *cp) cp++; - putkey(of, cp, TYPE_Fn); + putkey(mpage, cp, TYPE_Fn); if (n->string < cp) - putkeys(of, n->string, cp - n->string, TYPE_Ft); + putkeys(mpage, n->string, cp - n->string, TYPE_Ft); for (n = n->next; NULL != n; n = n->next) if (MDOC_TEXT == n->type) - putkey(of, n->string, TYPE_Fa); + putkey(mpage, n->string, TYPE_Fa); return(0); } static int -parse_mdoc_St(struct of *of, const struct mdoc_node *n) +parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n) { - - if (NULL == n->child || MDOC_TEXT != n->child->type) - return(0); - - putkey(of, n->child->string, TYPE_St); - return(1); -} - -static int -parse_mdoc_Xr(struct of *of, const struct mdoc_node *n) -{ char *cp; if (NULL == (n = n->child)) return(0); if (NULL == n->next) { - putkey(of, n->string, TYPE_Xr); + putkey(mpage, n->string, TYPE_Xr); return(0); } @@ -1515,13 +1522,13 @@ parse_mdoc_Xr(struct of *of, const struct mdoc_node *n perror(NULL); exit((int)MANDOCLEVEL_SYSERR); } - putkey(of, cp, TYPE_Xr); + putkey(mpage, cp, TYPE_Xr); free(cp); return(0); } static int -parse_mdoc_Nd(struct of *of, const struct mdoc_node *n) +parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_node *n) { size_t sz; @@ -1535,49 +1542,46 @@ parse_mdoc_Nd(struct of *of, const struct mdoc_node *n for (n = n->child; NULL != n; n = n->next) { if (MDOC_TEXT == n->type) { - if (NULL != of->desc) { - sz = strlen(of->desc) + + if (NULL != mpage->desc) { + sz = strlen(mpage->desc) + strlen(n->string) + 2; - of->desc = mandoc_realloc(of->desc, sz); - strlcat(of->desc, " ", sz); - strlcat(of->desc, n->string, sz); + mpage->desc = mandoc_realloc( + mpage->desc, sz); + strlcat(mpage->desc, " ", sz); + strlcat(mpage->desc, n->string, sz); } else - of->desc = mandoc_strdup(n->string); + mpage->desc = mandoc_strdup(n->string); } if (NULL != n->child) - parse_mdoc_Nd(of, n); + parse_mdoc_Nd(mpage, n); } return(1); } static int -parse_mdoc_Nm(struct of *of, const struct mdoc_node *n) +parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n) { - if (SEC_NAME == n->sec) - return(1); - else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type) - return(0); - - return(1); + return(SEC_NAME == n->sec || + (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)); } static int -parse_mdoc_Sh(struct of *of, const struct mdoc_node *n) +parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_node *n) { return(SEC_CUSTOM == n->sec && MDOC_HEAD == n->type); } static int -parse_mdoc_head(struct of *of, const struct mdoc_node *n) +parse_mdoc_head(struct mpage *mpage, const struct mdoc_node *n) { return(MDOC_HEAD == n->type); } static int -parse_mdoc_body(struct of *of, const struct mdoc_node *n) +parse_mdoc_body(struct mpage *mpage, const struct mdoc_node *n) { return(MDOC_BODY == n->type); @@ -1589,7 +1593,8 @@ parse_mdoc_body(struct of *of, const struct mdoc_node * When we finish the manual, we'll dump the table. */ static void -putkeys(const struct of *of, const char *cp, size_t sz, uint64_t v) +putkeys(const struct mpage *mpage, + const char *cp, size_t sz, uint64_t v) { struct str *s; unsigned int slot; @@ -1602,7 +1607,7 @@ putkeys(const struct of *of, const char *cp, size_t sz slot = ohash_qlookupi(&strings, cp, &end); s = ohash_find(&strings, slot); - if (NULL != s && of == s->of) { + if (NULL != s && mpage == s->mpage) { s->mask |= v; return; } else if (NULL == s) { @@ -1610,7 +1615,7 @@ putkeys(const struct of *of, const char *cp, size_t sz memcpy(s->key, cp, sz); ohash_insert(&strings, slot, s); } - s->of = of; + s->mpage = mpage; s->mask = v; } @@ -1667,11 +1672,11 @@ utf8(unsigned int cp, char out[7]) } /* - * Store the UTF-8 version of a key, or alias the pointer if the key has - * no UTF-8 transcription marks in it. + * Store the rendered version of a key, or alias the pointer + * if the key contains no escape sequences. */ static void -utf8key(struct mchars *mc, struct str *key) +render_key(struct mchars *mc, struct str *key) { size_t sz, bsz, pos; char utfbuf[7], res[5]; @@ -1680,7 +1685,7 @@ utf8key(struct mchars *mc, struct str *key) int len, u; enum mandoc_esc esc; - assert(NULL == key->utf8); + assert(NULL == key->rendered); res[0] = '\\'; res[1] = '\t'; @@ -1696,7 +1701,7 @@ utf8key(struct mchars *mc, struct str *key) * pointer as ourselvse and get out of here. */ if (strcspn(val, res) == bsz) { - key->utf8 = key->key; + key->rendered = key->key; return; } @@ -1731,54 +1736,63 @@ utf8key(struct mchars *mc, struct str *key) /* Read past the slash. */ val++; - u = 0; /* * Parse the escape sequence and see if it's a * predefined character or special character. */ + esc = mandoc_escape ((const char **)&val, &seq, &len); if (ESCAPE_ERROR == esc) break; - if (ESCAPE_SPECIAL != esc) continue; - if (0 == (u = mchars_spec2cp(mc, seq, len))) - continue; /* - * If we have a Unicode codepoint, try to convert that - * to a UTF-8 byte string. + * Render the special character + * as either UTF-8 or ASCII. */ - cpp = utfbuf; - if (0 == (sz = utf8(u, utfbuf))) - continue; + if (write_utf8) { + if (0 == (u = mchars_spec2cp(mc, seq, len))) + continue; + cpp = utfbuf; + if (0 == (sz = utf8(u, utfbuf))) + continue; + sz = strlen(cpp); + } else { + cpp = mchars_spec2str(mc, seq, len, &sz); + if (NULL == cpp) + continue; + if (ASCII_NBRSP == *cpp) { + cpp = " "; + sz = 1; + } + } + /* Copy the rendered glyph into the stream. */ - sz = strlen(cpp); bsz += sz; - buf = mandoc_realloc(buf, bsz); - memcpy(&buf[pos], cpp, sz); pos += sz; } buf[pos] = '\0'; - key->utf8 = buf; + key->rendered = buf; } /* * Flush the current page's terms (and their bits) into the database. * Wrap the entire set of additions in a transaction to make sqlite be a * little faster. - * Also, UTF-8-encode the description at the last possible moment. + * Also, handle escape sequences at the last possible moment. */ static void -dbindex(struct mchars *mc, int form, const struct of *of) +dbindex(const struct mpage *mpage, struct mchars *mc) { + struct mlink *mlink; struct str *key; const char *desc; int64_t recno; @@ -1786,46 +1800,54 @@ dbindex(struct mchars *mc, int form, const struct of * unsigned int slot; if (verb) - say(of->file, "Adding to index"); + say(mpage->mlinks->file, "Adding to index"); if (nodb) return; desc = ""; - if (NULL != of->desc) { + if (NULL != mpage->desc && '\0' != *mpage->desc) { key = ohash_find(&strings, - ohash_qlookup(&strings, of->desc)); + ohash_qlookup(&strings, mpage->desc)); assert(NULL != key); - if (NULL == key->utf8) - utf8key(mc, key); - desc = key->utf8; + if (NULL == key->rendered) + render_key(mc, key); + desc = key->rendered; } SQL_EXEC("BEGIN TRANSACTION"); i = 1; - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->file); - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->sec); - SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->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]); + 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->of == of); - if (NULL == key->utf8) - utf8key(mc, key); + assert(key->mpage == mpage); + if (NULL == key->rendered) + render_key(mc, key); i = 1; SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask); - SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->utf8); + SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered); 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); + if (key->rendered != key->key) + free(key->rendered); free(key); } @@ -1835,19 +1857,24 @@ dbindex(struct mchars *mc, int form, const struct of * static void dbprune(void) { - struct of *of; + struct mpage *mpage; + struct mlink *mlink; size_t i; + unsigned int slot; if (nodb) return; - for (of = ofs; NULL != of; of = of->next) { + mpage = ohash_first(&mpages, &slot); + while (NULL != mpage) { + mlink = mpage->mlinks; i = 1; - SQL_BIND_TEXT(stmts[STMT_DELETE], i, of->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(of->file, "Deleted from index"); + say(mlink->file, "Deleted from index"); + mpage = ohash_next(&mpages, &slot); } } @@ -1927,20 +1954,27 @@ dbopen(int real) return(0); } - sql = "CREATE TABLE \"docs\" (\n" + sql = "CREATE TABLE \"mpages\" (\n" + " \"desc\" TEXT NOT NULL,\n" + " \"form\" INTEGER NOT NULL,\n" + " \"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" - " \"desc\" TEXT NOT NULL,\n" - " \"form\" INTEGER 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" @@ -1954,13 +1988,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 " - "(file,sec,arch,desc,form) VALUES (?,?,?,?,?)"; - sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_DOC], NULL); + sql = "DELETE FROM mpages where file=?"; + sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL); + sql = "INSERT INTO mpages " + "(desc,form) VALUES (?,?)"; + 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__