=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.82 retrieving revision 1.84 diff -u -p -r1.82 -r1.84 --- mandoc/mandocdb.c 2013/12/27 03:06:17 1.82 +++ mandoc/mandocdb.c 2013/12/27 15:39:03 1.84 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.82 2013/12/27 03:06:17 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.84 2013/12/27 15:39:03 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 { @@ -106,7 +106,7 @@ struct mpage { struct mlink { char file[PATH_MAX]; /* filename rel. to manpath */ enum form dform; /* format from directory */ - enum form sform; /* format from file name suffix */ + 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) */ @@ -137,16 +137,12 @@ static void dbclose(int); static void dbindex(const struct mpage *, struct mchars *); static int dbopen(int); static void dbprune(void); -static void fileadd(struct mlink *); -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 mpages_free(void); static void mpages_merge(struct mchars *, struct mparse *, int); @@ -184,7 +180,7 @@ 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 sqlite3 *db = NULL; /* current database */ static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ @@ -323,17 +319,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 mlink, file); + mlinks_info.key_offset = offsetof(struct mlink, file); progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -408,7 +404,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) { /* @@ -462,7 +458,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])) @@ -480,7 +476,7 @@ main(int argc, char *argv[]) if (j + 1 < dirs.sz) { mpages_free(); ohash_delete(&mpages); - ohash_delete(&filenames); + ohash_delete(&mlinks); } } } @@ -491,7 +487,7 @@ out: mparse_free(mp); mpages_free(); ohash_delete(&mpages); - ohash_delete(&filenames); + ohash_delete(&mlinks); return(exitcode); usage: fprintf(stderr, "usage: %s [-anvW] [-C file]\n" @@ -524,8 +520,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]; @@ -549,7 +546,7 @@ 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. */ @@ -564,7 +561,7 @@ treescan(void) if (warnings) say(path, "Duplicate file"); continue; - } else if (NULL == (sec = + } else if (NULL == (fsec = strrchr(ff->fts_name, '.'))) { if ( ! use_all) { if (warnings) @@ -572,34 +569,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"); @@ -672,17 +678,16 @@ treescan(void) * or * [./]cat
[/]/.0 * - * Stuff this information directly into the mpage vector. + * Stuff this information directly into the mlink 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); @@ -711,8 +716,8 @@ filescan(const char *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. @@ -723,19 +728,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; - } + } } /* @@ -748,51 +753,24 @@ 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 mlink *mlink) -{ - unsigned int slot; - - slot = ohash_qlookup(&filenames, mlink->file); - assert(NULL == ohash_find(&filenames, slot)); - ohash_insert(&filenames, slot, mlink); -} - -/* - * See inoadd(). - */ -static int inocheck(const struct stat *st) { struct inodev inodev; @@ -806,71 +784,50 @@ inocheck(const struct stat *st) &mpages, (char *)&inodev, sizeof(inodev), hash))); } -/* - * 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) +mlink_add(struct mlink *mlink, const struct stat *st) { + struct inodev inodev; + struct mpage *mpage; unsigned int slot; - mpage->inodev.st_ino = st->st_ino; - mpage->inodev.st_dev = st->st_dev; - slot = ohash_lookup_memory(&mpages, (char *)&mpage->inodev, - sizeof(struct inodev), st->st_ino); + assert(NULL != mlink->file); - assert(NULL == ohash_find(&mpages, slot)); - ohash_insert(&mpages, slot, mpage); -} + 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(""); -static void -ofadd(int dform, const char *file, const char *name, const char *dsec, - const char *sec, const char *arch, const struct stat *st) -{ - struct mpage *mpage; - struct mlink *mlink; - 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; + 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 - sform = FORM_NONE; + mlink->fform = FORM_NONE; - mlink = mandoc_calloc(1, sizeof(struct mlink)); - strlcpy(mlink->file, file, PATH_MAX); - mlink->dform = dform; - mlink->sform = sform; - mlink->dsec = mandoc_strdup(dsec); - mlink->arch = mandoc_strdup(arch); - mlink->name = mandoc_strdup(name); - mlink->fsec = mandoc_strdup(sec); + slot = ohash_qlookup(&mlinks, mlink->file); + assert(NULL == ohash_find(&mlinks, slot)); + ohash_insert(&mlinks, slot, mlink); - mpage = mandoc_calloc(1, sizeof(struct 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 + abort(); mpage->mlinks = mlink; - - /* - * 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->mlinks); } static void @@ -967,7 +924,8 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int if (NULL != (bufp = strrchr(buf, '.'))) *++bufp = '\0'; strlcat(buf, mpage->mlinks->dsec, PATH_MAX); - if (filecheck(buf)) { + if (NULL != ohash_find(&mlinks, + ohash_qlookup(&mlinks, buf))) { if (warnings) say(mpage->mlinks->file, "Man " "source exists: %s", buf); @@ -988,7 +946,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int * formatted. Fall back to formatted mode. */ if (FORM_CAT != mpage->mlinks->dform || - FORM_CAT != mpage->mlinks->sform) { + FORM_CAT != mpage->mlinks->fform) { lvl = mparse_readfd(mp, -1, mpage->mlinks->file); if (lvl < MANDOCLEVEL_FATAL) mparse_result(mp, &mdoc, &man); @@ -999,9 +957,8 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int mpage->sec = mandoc_strdup(mdoc_meta(mdoc)->msec); mpage->arch = mdoc_meta(mdoc)->arch; - if (NULL == mpage->arch) - mpage->arch = ""; - mpage->arch = mandoc_strdup(mpage->arch); + mpage->arch = mandoc_strdup( + NULL == mpage->arch ? "" : mpage->arch); mpage->title = mandoc_strdup(mdoc_meta(mdoc)->title); } else if (NULL != man) {