version 1.78, 2013/12/26 22:12:46 |
version 1.83, 2013/12/27 14:29:28 |
|
|
char key[]; /* the string itself */ |
char key[]; /* the string itself */ |
}; |
}; |
|
|
struct id { |
struct inodev { |
ino_t ino; |
ino_t st_ino; |
dev_t dev; |
dev_t st_dev; |
}; |
}; |
|
|
struct mpage { |
struct mpage { |
struct id id; /* used for hashing routine */ |
struct inodev inodev; /* used for hashing routine */ |
struct mpage *next; /* next in mpages_list */ |
enum form form; /* format from file content */ |
enum form dform; /* path-cued form */ |
char *sec; /* section from file content */ |
enum form sform; /* suffix-cued form */ |
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 file[PATH_MAX]; /* filename rel. to manpath */ |
char *desc; /* parsed description */ |
enum form dform; /* format from directory */ |
char *name; /* name (from filename) (not empty) */ |
enum form sform; /* format from file name suffix */ |
char *sec; /* suffix-cued section (or empty) */ |
char *dsec; /* section from directory */ |
char *dsec; /* path-cued section (or empty) */ |
char *arch; /* architecture from directory */ |
char *arch; /* path-cued arch. (or empty) */ |
char *name; /* name from file name (not empty) */ |
|
char *fsec; /* section from file name suffix */ |
}; |
}; |
|
|
struct title { |
struct title { |
|
|
}; |
}; |
|
|
enum stmt { |
enum stmt { |
STMT_DELETE = 0, /* delete manpage */ |
STMT_DELETE_PAGE = 0, /* delete mpage */ |
STMT_INSERT_DOC, /* insert manpage */ |
STMT_INSERT_PAGE, /* insert mpage */ |
STMT_INSERT_KEY, /* insert parsed key */ |
STMT_INSERT_LINK, /* insert mlink */ |
|
STMT_INSERT_KEY, /* insert parsed key */ |
STMT__MAX |
STMT__MAX |
}; |
}; |
|
|
Line 126 struct mdoc_handler { |
|
Line 134 struct mdoc_handler { |
|
}; |
}; |
|
|
static void dbclose(int); |
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 int dbopen(int); |
static void dbprune(void); |
static void dbprune(void); |
static void fileadd(struct mpage *); |
|
static int filecheck(const char *); |
|
static void filescan(const char *); |
static void filescan(const char *); |
static void *hash_alloc(size_t, void *); |
static void *hash_alloc(size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void *hash_halloc(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 int inocheck(const struct stat *); |
static void ofadd(int, const char *, const char *, const char *, |
static void mlink_add(int, const char *, const char *, const char *, |
const char *, const char *, const struct stat *); |
const char *, const char *, const struct stat *); |
|
static void mlink_free(struct mlink *); |
static void mpages_free(void); |
static void mpages_free(void); |
static void mpages_merge(struct mchars *, struct mparse *, int); |
static void mpages_merge(struct mchars *, struct mparse *, int); |
static void parse_cat(struct mpage *); |
static void parse_cat(struct mpage *); |
Line 154 static int parse_mdoc_Nm(struct mpage *, const struct |
|
Line 160 static int parse_mdoc_Nm(struct mpage *, const struct |
|
static int parse_mdoc_Sh(struct mpage *, const struct mdoc_node *); |
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_St(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Xr(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 *, |
static void putkey(const struct mpage *, |
const char *, uint64_t); |
const char *, uint64_t); |
static void putkeys(const struct mpage *, |
static void putkeys(const struct mpage *, |
Line 162 static void putkeys(const struct mpage *, |
|
Line 167 static void putkeys(const struct mpage *, |
|
static void putmdockey(const struct mpage *, |
static void putmdockey(const struct mpage *, |
const struct mdoc_node *, uint64_t); |
const struct mdoc_node *, uint64_t); |
static void say(const char *, const char *, ...); |
static void say(const char *, const char *, ...); |
|
static int set_basedir(const char *); |
static int treescan(void); |
static int treescan(void); |
static size_t utf8(unsigned int, char [7]); |
static size_t utf8(unsigned int, char [7]); |
static void utf8key(struct mchars *, struct str *); |
static void utf8key(struct mchars *, struct str *); |
Line 175 static int exitcode; /* to be returned by main */ |
|
Line 181 static int exitcode; /* to be returned by main */ |
|
static enum op op; /* operational mode */ |
static enum op op; /* operational mode */ |
static char basedir[PATH_MAX]; /* current base directory */ |
static char basedir[PATH_MAX]; /* current base directory */ |
static struct ohash mpages; /* table of distinct manual pages */ |
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 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 *db = NULL; /* current database */ |
static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ |
static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */ |
|
|
Line 315 main(int argc, char *argv[]) |
|
Line 320 main(int argc, char *argv[]) |
|
struct mchars *mc; |
struct mchars *mc; |
struct manpaths dirs; |
struct manpaths dirs; |
struct mparse *mp; |
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(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *)); |
memset(&dirs, 0, sizeof(struct manpaths)); |
memset(&dirs, 0, sizeof(struct manpaths)); |
|
|
mpages_info.alloc = filename_info.alloc = hash_alloc; |
mpages_info.alloc = mlinks_info.alloc = hash_alloc; |
mpages_info.halloc = filename_info.halloc = hash_halloc; |
mpages_info.halloc = mlinks_info.halloc = hash_halloc; |
mpages_info.hfree = filename_info.hfree = hash_free; |
mpages_info.hfree = mlinks_info.hfree = hash_free; |
|
|
mpages_info.key_offset = offsetof(struct mpage, id); |
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], '/'); |
progname = strrchr(argv[0], '/'); |
if (progname == NULL) |
if (progname == NULL) |
Line 400 main(int argc, char *argv[]) |
|
Line 405 main(int argc, char *argv[]) |
|
mc = mchars_alloc(); |
mc = mchars_alloc(); |
|
|
ohash_init(&mpages, 6, &mpages_info); |
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) { |
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) { |
/* |
/* |
Line 454 main(int argc, char *argv[]) |
|
Line 459 main(int argc, char *argv[]) |
|
|
|
if (j) { |
if (j) { |
ohash_init(&mpages, 6, &mpages_info); |
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])) |
if (0 == set_basedir(dirs.paths[j])) |
Line 470 main(int argc, char *argv[]) |
|
Line 475 main(int argc, char *argv[]) |
|
dbclose(0); |
dbclose(0); |
|
|
if (j + 1 < dirs.sz) { |
if (j + 1 < dirs.sz) { |
ohash_delete(&mpages); |
|
ohash_delete(&filenames); |
|
mpages_free(); |
mpages_free(); |
|
ohash_delete(&mpages); |
|
ohash_delete(&mlinks); |
} |
} |
} |
} |
} |
} |
|
|
manpath_free(&dirs); |
manpath_free(&dirs); |
mchars_free(mc); |
mchars_free(mc); |
mparse_free(mp); |
mparse_free(mp); |
ohash_delete(&mpages); |
|
ohash_delete(&filenames); |
|
mpages_free(); |
mpages_free(); |
|
ohash_delete(&mpages); |
|
ohash_delete(&mlinks); |
return(exitcode); |
return(exitcode); |
usage: |
usage: |
fprintf(stderr, "usage: %s [-anvW] [-C file]\n" |
fprintf(stderr, "usage: %s [-anvW] [-C file]\n" |
|
|
while (NULL != (ff = fts_read(f))) { |
while (NULL != (ff = fts_read(f))) { |
path = ff->fts_path + 2; |
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. |
* stored directory data and handling the filename. |
* Disallow duplicate (hard-linked) files. |
* Disallow duplicate (hard-linked) files. |
*/ |
*/ |
|
|
continue; |
continue; |
} else |
} else |
sec[-1] = '\0'; |
sec[-1] = '\0'; |
ofadd(dform, path, ff->fts_name, dsec, sec, |
mlink_add(dform, path, ff->fts_name, dsec, sec, |
arch, ff->fts_statp); |
arch, ff->fts_statp); |
continue; |
continue; |
} else if (FTS_D != ff->fts_info && |
} else if (FTS_D != ff->fts_info && |
|
|
* or |
* or |
* [./]cat<section>[/<arch>]/<name>.0 |
* [./]cat<section>[/<arch>]/<name>.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. |
* See treescan() for the fts(3) version of this. |
*/ |
*/ |
static void |
static void |
Line 753 filescan(const char *file) |
|
Line 758 filescan(const char *file) |
|
*p = '\0'; |
*p = '\0'; |
} |
} |
|
|
ofadd(dform, file, name, dsec, sec, arch, &st); |
mlink_add(dform, file, name, dsec, sec, arch, &st); |
} |
} |
|
|
/* |
|
* See fileadd(). |
|
*/ |
|
static int |
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) |
|
{ |
|
unsigned int slot; |
|
|
|
slot = ohash_qlookup(&filenames, mpage->file); |
|
assert(NULL == ohash_find(&filenames, slot)); |
|
ohash_insert(&filenames, slot, mpage); |
|
} |
|
|
|
/* |
|
* See inoadd(). |
|
*/ |
|
static int |
|
inocheck(const struct stat *st) |
inocheck(const struct stat *st) |
{ |
{ |
struct id id; |
struct inodev inodev; |
uint32_t hash; |
uint32_t hash; |
|
|
memset(&id, 0, sizeof(id)); |
memset(&inodev, 0, sizeof(inodev)); |
id.ino = hash = st->st_ino; |
inodev.st_ino = hash = st->st_ino; |
id.dev = st->st_dev; |
inodev.st_dev = st->st_dev; |
|
|
return(NULL != ohash_find(&mpages, ohash_lookup_memory( |
return(NULL != ohash_find(&mpages, ohash_lookup_memory( |
&mpages, (char *)&id, sizeof(id), hash))); |
&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 |
static void |
inoadd(const struct stat *st, struct mpage *mpage) |
mlink_add(int dform, const char *file, const char *name, const char *dsec, |
{ |
|
uint32_t hash; |
|
unsigned int slot; |
|
|
|
mpage->id.ino = hash = st->st_ino; |
|
mpage->id.dev = st->st_dev; |
|
slot = ohash_lookup_memory |
|
(&mpages, (char *)&mpage->id, sizeof(mpage->id), hash); |
|
|
|
assert(NULL == ohash_find(&mpages, slot)); |
|
ohash_insert(&mpages, slot, mpage); |
|
} |
|
|
|
static void |
|
ofadd(int dform, const char *file, const char *name, const char *dsec, |
|
const char *sec, const char *arch, const struct stat *st) |
const char *sec, const char *arch, const struct stat *st) |
{ |
{ |
|
struct inodev inodev; |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
int sform; |
int sform; |
|
unsigned int slot; |
|
|
assert(NULL != file); |
assert(NULL != file); |
|
|
Line 844 ofadd(int dform, const char *file, const char *name, c |
|
Line 804 ofadd(int dform, const char *file, const char *name, c |
|
else |
else |
sform = FORM_NONE; |
sform = FORM_NONE; |
|
|
mpage = mandoc_calloc(1, sizeof(struct mpage)); |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
strlcpy(mpage->file, file, PATH_MAX); |
strlcpy(mlink->file, file, PATH_MAX); |
mpage->name = mandoc_strdup(name); |
mlink->dform = dform; |
mpage->sec = mandoc_strdup(sec); |
mlink->sform = sform; |
mpage->dsec = mandoc_strdup(dsec); |
mlink->dsec = mandoc_strdup(dsec); |
mpage->arch = mandoc_strdup(arch); |
mlink->arch = mandoc_strdup(arch); |
mpage->sform = sform; |
mlink->name = mandoc_strdup(name); |
mpage->dform = dform; |
mlink->fsec = mandoc_strdup(sec); |
mpage->next = mpages_list; |
|
mpages_list = mpage; |
|
|
|
/* |
slot = ohash_qlookup(&mlinks, mlink->file); |
* Add to unique identifier hash. |
assert(NULL == ohash_find(&mlinks, slot)); |
* Then if it's a source manual and we're going to use source in |
ohash_insert(&mlinks, slot, mlink); |
* favour of catpages, add it to that hash. |
|
*/ |
inodev.st_ino = st->st_ino; |
inoadd(st, mpage); |
inodev.st_dev = st->st_dev; |
fileadd(mpage); |
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; |
} |
} |
|
|
static void |
static void |
|
mlink_free(struct mlink *mlink) |
|
{ |
|
|
|
free(mlink->dsec); |
|
free(mlink->arch); |
|
free(mlink->name); |
|
free(mlink->fsec); |
|
free(mlink); |
|
} |
|
|
|
static void |
mpages_free(void) |
mpages_free(void) |
{ |
{ |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
|
unsigned int slot; |
|
|
while (NULL != (mpage = mpages_list)) { |
mpage = ohash_first(&mpages, &slot); |
mpages_list = mpage->next; |
while (NULL != mpage) { |
free(mpage->name); |
while (NULL != (mlink = mpage->mlinks)) { |
|
mpage->mlinks = NULL; |
|
mlink_free(mlink); |
|
} |
free(mpage->sec); |
free(mpage->sec); |
free(mpage->dsec); |
|
free(mpage->arch); |
free(mpage->arch); |
|
free(mpage->title); |
|
free(mpage->desc); |
free(mpage); |
free(mpage); |
|
mpage = ohash_next(&mpages, &slot); |
} |
} |
} |
} |
|
|
/* |
/* |
* Run through the files in the global vector "mpages_list" and add them to the |
* Run through the files in the global vector "mpages" |
* database specified in "basedir". |
* and add them to the database specified in "basedir". |
* |
* |
* This handles the parsing scheme itself, using the cues of directory |
* This handles the parsing scheme itself, using the cues of directory |
* and filename to determine whether the file is parsable or not. |
* and filename to determine whether the file is parsable or not. |
Line 897 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 883 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
struct man *man; |
struct man *man; |
struct title *title_entry; |
struct title *title_entry; |
char *bufp, *title_str; |
char *bufp, *title_str; |
const char *msec, *march, *mtitle, *cp; |
const char *cp; |
size_t sz; |
size_t sz; |
int form; |
|
int match; |
int match; |
unsigned int slot; |
unsigned int pslot, tslot; |
enum mandoclevel lvl; |
enum mandoclevel lvl; |
|
|
str_info.alloc = hash_alloc; |
str_info.alloc = hash_alloc; |
Line 917 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 902 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
ohash_init(&title_table, 6, &title_info); |
ohash_init(&title_table, 6, &title_info); |
} |
} |
|
|
for (mpage = mpages_list; NULL != mpage; mpage = mpage->next) { |
mpage = ohash_first(&mpages, &pslot); |
|
while (NULL != mpage) { |
/* |
/* |
* If we're a catpage (as defined by our path), then see |
* If we're a catpage (as defined by our path), then see |
* if a manpage exists by the same name (ignoring the |
* if a manpage exists by the same name (ignoring the |
Line 925 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 911 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* If it does, then we want to use it instead of our |
* If it does, then we want to use it instead of our |
* own. |
* own. |
*/ |
*/ |
if ( ! use_all && FORM_CAT == mpage->dform) { |
if ( ! use_all && FORM_CAT == mpage->mlinks->dform) { |
sz = strlcpy(buf, mpage->file, PATH_MAX); |
sz = strlcpy(buf, mpage->mlinks->file, PATH_MAX); |
if (sz >= PATH_MAX) { |
if (sz >= PATH_MAX) { |
if (warnings) |
if (warnings) |
say(mpage->file, |
say(mpage->mlinks->file, |
"Filename too long"); |
"Filename too long"); |
|
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
} |
} |
bufp = strstr(buf, "cat"); |
bufp = strstr(buf, "cat"); |
Line 938 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 925 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
memcpy(bufp, "man", 3); |
memcpy(bufp, "man", 3); |
if (NULL != (bufp = strrchr(buf, '.'))) |
if (NULL != (bufp = strrchr(buf, '.'))) |
*++bufp = '\0'; |
*++bufp = '\0'; |
strlcat(buf, mpage->dsec, PATH_MAX); |
strlcat(buf, mpage->mlinks->dsec, PATH_MAX); |
if (filecheck(buf)) { |
if (NULL != ohash_find(&mlinks, |
|
ohash_qlookup(&mlinks, buf))) { |
if (warnings) |
if (warnings) |
say(mpage->file, "Man " |
say(mpage->mlinks->file, "Man " |
"source exists: %s", buf); |
"source exists: %s", buf); |
|
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
} |
} |
} |
} |
Line 958 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 947 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* source code, unless it is already known to be |
* source code, unless it is already known to be |
* formatted. Fall back to formatted mode. |
* formatted. Fall back to formatted mode. |
*/ |
*/ |
if (FORM_CAT != mpage->dform || FORM_CAT != mpage->sform) { |
if (FORM_CAT != mpage->mlinks->dform || |
lvl = mparse_readfd(mp, -1, mpage->file); |
FORM_CAT != mpage->mlinks->sform) { |
|
lvl = mparse_readfd(mp, -1, mpage->mlinks->file); |
if (lvl < MANDOCLEVEL_FATAL) |
if (lvl < MANDOCLEVEL_FATAL) |
mparse_result(mp, &mdoc, &man); |
mparse_result(mp, &mdoc, &man); |
} |
} |
|
|
if (NULL != mdoc) { |
if (NULL != mdoc) { |
form = 1; |
mpage->form = FORM_SRC; |
msec = mdoc_meta(mdoc)->msec; |
mpage->sec = |
march = mdoc_meta(mdoc)->arch; |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mtitle = mdoc_meta(mdoc)->title; |
mpage->arch = mdoc_meta(mdoc)->arch; |
|
if (NULL == mpage->arch) |
|
mpage->arch = ""; |
|
mpage->arch = mandoc_strdup(mpage->arch); |
|
mpage->title = |
|
mandoc_strdup(mdoc_meta(mdoc)->title); |
} else if (NULL != man) { |
} else if (NULL != man) { |
form = 1; |
mpage->form = FORM_SRC; |
msec = man_meta(man)->msec; |
mpage->sec = |
march = mpage->arch; |
mandoc_strdup(man_meta(man)->msec); |
mtitle = man_meta(man)->title; |
mpage->arch = |
|
mandoc_strdup(mpage->mlinks->arch); |
|
mpage->title = |
|
mandoc_strdup(man_meta(man)->title); |
} else { |
} else { |
form = 0; |
mpage->form = FORM_CAT; |
msec = mpage->dsec; |
mpage->sec = |
march = mpage->arch; |
mandoc_strdup(mpage->mlinks->dsec); |
mtitle = mpage->name; |
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 |
* Check whether the manual section given in a file |
* agrees with the directory where the file is located. |
* agrees with the directory where the file is located. |
Line 997 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 991 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* section, like encrypt(1) = makekey(8). Do not skip |
* section, like encrypt(1) = makekey(8). Do not skip |
* manuals for such reasons. |
* manuals for such reasons. |
*/ |
*/ |
if (warnings && !use_all && form && |
if (warnings && !use_all && FORM_SRC == mpage->form && |
strcasecmp(msec, mpage->dsec)) { |
strcasecmp(mpage->sec, mpage->mlinks->dsec)) { |
match = 0; |
match = 0; |
say(mpage->file, "Section \"%s\" " |
say(mpage->mlinks->file, "Section \"%s\" " |
"manual in %s directory", |
"manual in %s directory", |
msec, mpage->dsec); |
mpage->sec, mpage->mlinks->dsec); |
} |
} |
|
|
/* |
/* |
Line 1019 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1013 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
* Thus, warn about architecture mismatches, |
* Thus, warn about architecture mismatches, |
* but don't skip manuals for this reason. |
* 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; |
match = 0; |
say(mpage->file, "Architecture \"%s\" " |
say(mpage->mlinks->file, "Architecture \"%s\" " |
"manual in \"%s\" directory", |
"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; |
match = 0; |
|
|
putkey(mpage, mpage->name, TYPE_Nm); |
putkey(mpage, mpage->mlinks->name, TYPE_Nm); |
|
|
if (NULL != mdoc) { |
if (NULL != mdoc) { |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
Line 1036 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1032 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
assert(NULL == mpage->desc); |
assert(NULL == mpage->desc); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
putkey(mpage, NULL != mpage->desc ? |
putkey(mpage, NULL != mpage->desc ? |
mpage->desc : mpage->name, TYPE_Nd); |
mpage->desc : mpage->mlinks->name, TYPE_Nd); |
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(mpage, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
Line 1049 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1045 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
*/ |
*/ |
|
|
if (check_reachable) { |
if (check_reachable) { |
if (-1 == asprintf(&title_str, "%s(%s%s%s)", mtitle, |
if (-1 == asprintf(&title_str, "%s(%s%s%s)", |
msec, '\0' == *march ? "" : "/", march)) { |
mpage->title, mpage->sec, |
|
'\0' == *mpage->arch ? "" : "/", |
|
mpage->arch)) { |
perror(NULL); |
perror(NULL); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
slot = ohash_qlookup(&title_table, title_str); |
tslot = ohash_qlookup(&title_table, title_str); |
title_entry = ohash_find(&title_table, slot); |
title_entry = ohash_find(&title_table, tslot); |
if (NULL == title_entry) { |
if (NULL == title_entry) { |
title_entry = mandoc_malloc( |
title_entry = mandoc_malloc( |
sizeof(struct title)); |
sizeof(struct title)); |
title_entry->title = title_str; |
title_entry->title = title_str; |
title_entry->file = mandoc_strdup( |
title_entry->file = mandoc_strdup( |
match ? "" : mpage->file); |
match ? "" : mpage->mlinks->file); |
ohash_insert(&title_table, slot, |
ohash_insert(&title_table, tslot, |
title_entry); |
title_entry); |
} else { |
} else { |
if (match) |
if (match) |
Line 1071 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1069 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
} |
} |
} |
} |
|
|
dbindex(mc, form, mpage); |
dbindex(mpage, mc); |
ohash_delete(&strings); |
ohash_delete(&strings); |
|
mpage = ohash_next(&mpages, &pslot); |
} |
} |
|
|
if (check_reachable) { |
if (check_reachable) { |
title_entry = ohash_first(&title_table, &slot); |
title_entry = ohash_first(&title_table, &tslot); |
while (NULL != title_entry) { |
while (NULL != title_entry) { |
if ('\0' != *title_entry->file) |
if ('\0' != *title_entry->file) |
say(title_entry->file, |
say(title_entry->file, |
Line 1085 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1084 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
free(title_entry->title); |
free(title_entry->title); |
free(title_entry->file); |
free(title_entry->file); |
free(title_entry); |
free(title_entry); |
title_entry = ohash_next(&title_table, &slot); |
title_entry = ohash_next(&title_table, &tslot); |
} |
} |
ohash_delete(&title_table); |
ohash_delete(&title_table); |
} |
} |
Line 1098 parse_cat(struct mpage *mpage) |
|
Line 1097 parse_cat(struct mpage *mpage) |
|
char *line, *p, *title; |
char *line, *p, *title; |
size_t len, plen, titlesz; |
size_t len, plen, titlesz; |
|
|
if (NULL == (stream = fopen(mpage->file, "r"))) { |
if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) { |
if (warnings) |
if (warnings) |
say(mpage->file, NULL); |
say(mpage->mlinks->file, NULL); |
return; |
return; |
} |
} |
|
|
Line 1153 parse_cat(struct mpage *mpage) |
|
Line 1152 parse_cat(struct mpage *mpage) |
|
|
|
if (NULL == title || '\0' == *title) { |
if (NULL == title || '\0' == *title) { |
if (warnings) |
if (warnings) |
say(mpage->file, "Cannot find NAME section"); |
say(mpage->mlinks->file, |
|
"Cannot find NAME section"); |
assert(NULL == mpage->desc); |
assert(NULL == mpage->desc); |
mpage->desc = mandoc_strdup(mpage->name); |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
putkey(mpage, mpage->name, TYPE_Nd); |
putkey(mpage, mpage->mlinks->name, TYPE_Nd); |
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
return; |
return; |
Line 1176 parse_cat(struct mpage *mpage) |
|
Line 1176 parse_cat(struct mpage *mpage) |
|
/* Skip to next word. */ ; |
/* Skip to next word. */ ; |
} else { |
} else { |
if (warnings) |
if (warnings) |
say(mpage->file, "No dash in title line"); |
say(mpage->mlinks->file, |
|
"No dash in title line"); |
p = title; |
p = title; |
} |
} |
|
|
Line 1786 utf8key(struct mchars *mc, struct str *key) |
|
Line 1787 utf8key(struct mchars *mc, struct str *key) |
|
* Also, UTF-8-encode the description at the last possible moment. |
* Also, UTF-8-encode the description at the last possible moment. |
*/ |
*/ |
static void |
static void |
dbindex(struct mchars *mc, int form, const struct mpage *mpage) |
dbindex(const struct mpage *mpage, struct mchars *mc) |
{ |
{ |
struct str *key; |
struct str *key; |
const char *desc; |
const char *desc; |
Line 1795 dbindex(struct mchars *mc, int form, const struct mpag |
|
Line 1796 dbindex(struct mchars *mc, int form, const struct mpag |
|
unsigned int slot; |
unsigned int slot; |
|
|
if (verb) |
if (verb) |
say(mpage->file, "Adding to index"); |
say(mpage->mlinks->file, "Adding to index"); |
|
|
if (nodb) |
if (nodb) |
return; |
return; |
Line 1813 dbindex(struct mchars *mc, int form, const struct mpag |
|
Line 1814 dbindex(struct mchars *mc, int form, const struct mpag |
|
SQL_EXEC("BEGIN TRANSACTION"); |
SQL_EXEC("BEGIN TRANSACTION"); |
|
|
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->file); |
/* |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->sec); |
* XXX The following three lines are obsolete |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->arch); |
* and only kept for backward compatibility |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, desc); |
* until apropos(1) and friends have caught up. |
SQL_BIND_INT(stmts[STMT_INSERT_DOC], i, form); |
*/ |
SQL_STEP(stmts[STMT_INSERT_DOC]); |
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); |
recno = sqlite3_last_insert_rowid(db); |
sqlite3_reset(stmts[STMT_INSERT_DOC]); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
|
|
|
i = 1; |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->dsec); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->arch); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->mlinks->file); |
|
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; |
for (key = ohash_first(&strings, &slot); NULL != key; |
key = ohash_next(&strings, &slot)) { |
key = ohash_next(&strings, &slot)) { |
assert(key->mpage == mpage); |
assert(key->mpage == mpage); |
|
|
dbprune(void) |
dbprune(void) |
{ |
{ |
struct mpage *mpage; |
struct mpage *mpage; |
|
struct mlink *mlink; |
size_t i; |
size_t i; |
|
unsigned int slot; |
|
|
if (nodb) |
if (nodb) |
return; |
return; |
|
|
for (mpage = mpages_list; NULL != mpage; mpage = mpage->next) { |
mpage = ohash_first(&mpages, &slot); |
|
while (NULL != mpage) { |
|
mlink = mpage->mlinks; |
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_DELETE], i, mpage->file); |
SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mlink->file); |
SQL_STEP(stmts[STMT_DELETE]); |
SQL_STEP(stmts[STMT_DELETE_PAGE]); |
sqlite3_reset(stmts[STMT_DELETE]); |
sqlite3_reset(stmts[STMT_DELETE_PAGE]); |
if (verb) |
if (verb) |
say(mpage->file, "Deleted from index"); |
say(mlink->file, "Deleted from index"); |
|
mpage = ohash_next(&mpages, &slot); |
} |
} |
} |
} |
|
|
Line 1936 dbopen(int real) |
|
Line 1955 dbopen(int real) |
|
return(0); |
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" |
" \"file\" TEXT NOT NULL,\n" |
" \"sec\" TEXT NOT NULL,\n" |
" \"sec\" TEXT NOT NULL,\n" |
" \"arch\" TEXT NOT NULL,\n" |
" \"arch\" TEXT NOT NULL,\n" |
Line 1945 dbopen(int real) |
|
Line 1969 dbopen(int real) |
|
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
");\n" |
");\n" |
"\n" |
"\n" |
|
"CREATE TABLE \"mlinks\" (\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" |
"CREATE TABLE \"keys\" (\n" |
" \"bits\" INTEGER NOT NULL,\n" |
" \"bits\" INTEGER NOT NULL,\n" |
" \"key\" TEXT NOT NULL,\n" |
" \"key\" TEXT NOT NULL,\n" |
" \"docid\" INTEGER NOT NULL REFERENCES docs(id) " |
" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " |
"ON DELETE CASCADE,\n" |
"ON DELETE CASCADE,\n" |
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
");\n" |
");\n" |
"\n" |
"\n" |
Line 1963 dbopen(int real) |
|
Line 1996 dbopen(int real) |
|
|
|
prepare_statements: |
prepare_statements: |
SQL_EXEC("PRAGMA foreign_keys = ON"); |
SQL_EXEC("PRAGMA foreign_keys = ON"); |
sql = "DELETE FROM docs where file=?"; |
sql = "DELETE FROM mpages where file=?"; |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE], NULL); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL); |
sql = "INSERT INTO docs " |
sql = "INSERT INTO mpages " |
"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)"; |
"(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 " |
|
"(sec,arch,name,pageid) VALUES (?,?,?,?)"; |
|
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL); |
sql = "INSERT INTO keys " |
sql = "INSERT INTO keys " |
"(bits,key,docid) VALUES (?,?,?)"; |
"(bits,key,pageid) VALUES (?,?,?)"; |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL); |
|
|
#ifndef __APPLE__ |
#ifndef __APPLE__ |