=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.68 retrieving revision 1.73 diff -u -p -r1.68 -r1.73 --- mandoc/mandocdb.c 2013/06/07 05:27:50 1.68 +++ mandoc/mandocdb.c 2013/10/18 23:07:23 1.73 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.68 2013/06/07 05:27:50 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.73 2013/10/18 23:07:23 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013 Ingo Schwarze @@ -106,6 +106,11 @@ struct of { char *arch; /* path-cued arch. (or empty) */ }; +struct title { + char *title; /* name(sec/arch) given inside the file */ + char *file; /* file name in case of mismatch */ +}; + enum stmt { STMT_DELETE = 0, /* delete manpage */ STMT_INSERT_DOC, /* insert manpage */ @@ -135,8 +140,7 @@ 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 *, - struct ohash_info*); +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 *); @@ -311,21 +315,17 @@ main(int argc, char *argv[]) struct mchars *mc; struct manpaths dirs; struct mparse *mp; - struct ohash_info ino_info, filename_info, str_info; + struct ohash_info ino_info, filename_info; memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); memset(&dirs, 0, sizeof(struct manpaths)); - ino_info.halloc = filename_info.halloc = - str_info.halloc = hash_halloc; - ino_info.hfree = filename_info.hfree = - str_info.hfree = hash_free; - ino_info.alloc = filename_info.alloc = - str_info.alloc = hash_alloc; + ino_info.alloc = filename_info.alloc = hash_alloc; + ino_info.halloc = filename_info.halloc = hash_halloc; + ino_info.hfree = filename_info.hfree = hash_free; ino_info.key_offset = offsetof(struct of, id); filename_info.key_offset = offsetof(struct of, file); - str_info.key_offset = offsetof(struct str, key); progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -422,7 +422,7 @@ main(int argc, char *argv[]) if (OP_TEST != op) dbprune(); if (OP_DELETE != op) - ofmerge(mc, mp, &str_info); + ofmerge(mc, mp, 0); dbclose(1); } else { /* @@ -440,9 +440,8 @@ main(int argc, char *argv[]) manpath_parse(&dirs, path_arg, NULL, NULL); /* - * First scan the tree rooted at a base directory. - * Then whak its database (if one exists), parse, and - * build up the database. + * First scan the tree rooted at a base directory, then + * build a new database and finally move it into place. * Ignore zero-length directories and strip trailing * slashes. */ @@ -467,16 +466,7 @@ main(int argc, char *argv[]) if (0 == dbopen(0)) goto out; - /* - * Since we're opening up a new database, we can - * turn off synchronous mode for much better - * performance. - */ -#ifndef __APPLE__ - SQL_EXEC("PRAGMA synchronous = OFF"); -#endif - - ofmerge(mc, mp, &str_info); + ofmerge(mc, mp, warnings && !use_all); dbclose(0); if (j + 1 < dirs.sz) { @@ -695,7 +685,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; @@ -897,19 +887,36 @@ offree(void) * and filename to determine whether the file is parsable or not. */ static void -ofmerge(struct mchars *mc, struct mparse *mp, - struct ohash_info *infop) +ofmerge(struct mchars *mc, struct mparse *mp, int check_reachable) { - int form; - size_t sz; - struct mdoc *mdoc; - struct man *man; - char buf[PATH_MAX]; - char *bufp; - const char *msec, *march, *mtitle, *cp; - struct of *of; - enum mandoclevel lvl; + struct ohash title_table; + struct ohash_info title_info, str_info; + char buf[PATH_MAX]; + struct of *of; + 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; + int match; + unsigned int slot; + enum mandoclevel lvl; + str_info.alloc = hash_alloc; + str_info.halloc = hash_halloc; + str_info.hfree = hash_free; + str_info.key_offset = offsetof(struct str, key); + + if (check_reachable) { + title_info.alloc = hash_alloc; + title_info.halloc = hash_halloc; + title_info.hfree = hash_free; + title_info.key_offset = offsetof(struct title, title); + 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 @@ -939,7 +946,7 @@ ofmerge(struct mchars *mc, struct mparse *mp, } } - ohash_init(&strings, 6, infop); + ohash_init(&strings, 6, &str_info); mparse_reset(mp); mdoc = NULL; man = NULL; @@ -947,6 +954,7 @@ ofmerge(struct mchars *mc, struct mparse *mp, msec = of->dsec; march = of->arch; mtitle = of->name; + match = 1; /* * Try interpreting the file as mdoc(7) or man(7) @@ -988,10 +996,12 @@ ofmerge(struct mchars *mc, struct mparse *mp, * manuals for such reasons. */ if (warnings && !use_all && form && - strcasecmp(msec, of->dsec)) + strcasecmp(msec, of->dsec)) { + match = 0; say(of->file, "Section \"%s\" " "manual in %s directory", msec, of->dsec); + } /* * Manual page directories exist for each kernel @@ -1007,10 +1017,14 @@ ofmerge(struct mchars *mc, struct mparse *mp, * 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 && strcasecmp(march, of->arch)) { + match = 0; say(of->file, "Architecture \"%s\" " "manual in \"%s\" directory", march, of->arch); + } + if (warnings && !use_all && strcasecmp(mtitle, of->name)) + match = 0; putkey(of, of->name, TYPE_Nm); @@ -1026,9 +1040,53 @@ ofmerge(struct mchars *mc, struct mparse *mp, else parse_catpage(of); + /* + * Build a title string for the file. If it matches + * the location of the file, remember the title as + * found; else, remember it as missing. + */ + + if (check_reachable) { + if (-1 == asprintf(&title_str, "%s(%s%s%s)", mtitle, + msec, '\0' == *march ? "" : "/", march)) { + perror(NULL); + exit((int)MANDOCLEVEL_SYSERR); + } + slot = ohash_qlookup(&title_table, title_str); + title_entry = ohash_find(&title_table, slot); + 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, + title_entry); + } else { + if (match) + *title_entry->file = '\0'; + free(title_str); + } + } + dbindex(mc, form, of); ohash_delete(&strings); } + + if (check_reachable) { + title_entry = ohash_first(&title_table, &slot); + while (NULL != title_entry) { + if ('\0' != *title_entry->file) + say(title_entry->file, + "Probably unreachable, title is %s", + title_entry->title); + free(title_entry->title); + free(title_entry->file); + free(title_entry); + title_entry = ohash_next(&title_table, &slot); + } + ohash_delete(&title_table); + } } static void @@ -1734,7 +1792,7 @@ dbindex(struct mchars *mc, int form, const struct of * return; desc = ""; - if (NULL != of->desc) { + if (NULL != of->desc && '\0' != *of->desc) { key = ohash_find(&strings, ohash_qlookup(&strings, of->desc)); assert(NULL != key); @@ -1904,6 +1962,17 @@ prepare_statements: sql = "INSERT INTO keys " "(bits,key,docid) VALUES (?,?,?)"; sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL); + +#ifndef __APPLE__ + /* + * When opening a new database, we can turn off + * synchronous mode for much better performance. + */ + + if (real) + SQL_EXEC("PRAGMA synchronous = OFF"); +#endif + return(1); }