version 1.74, 2013/10/27 16:09:44 |
version 1.83, 2013/12/27 14:29:28 |
|
|
|
|
struct str { |
struct str { |
char *utf8; /* key in UTF-8 form */ |
char *utf8; /* key in UTF-8 form */ |
const struct of *of; /* if set, the owning parse */ |
const struct mpage *mpage; /* if set, the owning parse */ |
uint64_t mask; /* bitmask in sequence */ |
uint64_t mask; /* bitmask in sequence */ |
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 of { |
struct mpage { |
struct id id; /* used for hashing routine */ |
struct inodev inodev; /* used for hashing routine */ |
struct of *next; /* next in ofs */ |
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 |
}; |
}; |
|
|
typedef int (*mdoc_fp)(struct of *, const struct mdoc_node *); |
typedef int (*mdoc_fp)(struct mpage *, const struct mdoc_node *); |
|
|
struct mdoc_handler { |
struct mdoc_handler { |
mdoc_fp fp; /* optional handler */ |
mdoc_fp fp; /* optional handler */ |
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 of *); |
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 of *); |
|
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 of *); |
|
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 offree(void); |
static void mlink_free(struct mlink *); |
static void ofmerge(struct mchars *, struct mparse *, int); |
static void mpages_free(void); |
static void parse_catpage(struct of *); |
static void mpages_merge(struct mchars *, struct mparse *, int); |
static void parse_man(struct of *, const struct man_node *); |
static void parse_cat(struct mpage *); |
static void parse_mdoc(struct of *, const struct mdoc_node *); |
static void parse_man(struct mpage *, const struct man_node *); |
static int parse_mdoc_body(struct of *, const struct mdoc_node *); |
static void parse_mdoc(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_head(struct of *, const struct mdoc_node *); |
static int parse_mdoc_body(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fd(struct of *, const struct mdoc_node *); |
static int parse_mdoc_head(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Fn(struct of *, const struct mdoc_node *); |
static int parse_mdoc_Fd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_In(struct of *, const struct mdoc_node *); |
static int parse_mdoc_Fn(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Nd(struct of *, const struct mdoc_node *); |
static int parse_mdoc_In(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Nm(struct of *, const struct mdoc_node *); |
static int parse_mdoc_Nd(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Sh(struct of *, const struct mdoc_node *); |
static int parse_mdoc_Nm(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_St(struct of *, const struct mdoc_node *); |
static int parse_mdoc_Sh(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_Xr(struct of *, const struct mdoc_node *); |
static int parse_mdoc_St(struct mpage *, const struct mdoc_node *); |
static int set_basedir(const char *); |
static int parse_mdoc_Xr(struct mpage *, const struct mdoc_node *); |
static void putkey(const struct of *, |
static void putkey(const struct mpage *, |
const char *, uint64_t); |
const char *, uint64_t); |
static void putkeys(const struct of *, |
static void putkeys(const struct mpage *, |
const char *, size_t, uint64_t); |
const char *, size_t, uint64_t); |
static void putmdockey(const struct of *, |
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 174 static int warnings; /* warn about crap */ |
|
Line 180 static int warnings; /* warn about crap */ |
|
static int exitcode; /* to be returned by main */ |
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 inos; /* table of inodes/devices */ |
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 of *ofs = 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 ino_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)); |
|
|
ino_info.alloc = filename_info.alloc = hash_alloc; |
mpages_info.alloc = mlinks_info.alloc = hash_alloc; |
ino_info.halloc = filename_info.halloc = hash_halloc; |
mpages_info.halloc = mlinks_info.halloc = hash_halloc; |
ino_info.hfree = filename_info.hfree = hash_free; |
mpages_info.hfree = mlinks_info.hfree = hash_free; |
|
|
ino_info.key_offset = offsetof(struct of, id); |
mpages_info.key_offset = offsetof(struct mpage, inodev); |
filename_info.key_offset = offsetof(struct of, file); |
mlinks_info.key_offset = offsetof(struct mlink, file); |
|
|
progname = strrchr(argv[0], '/'); |
progname = strrchr(argv[0], '/'); |
if (progname == NULL) |
if (progname == NULL) |
Line 399 main(int argc, char *argv[]) |
|
Line 404 main(int argc, char *argv[]) |
|
MANDOCLEVEL_FATAL, NULL, NULL, NULL); |
MANDOCLEVEL_FATAL, NULL, NULL, NULL); |
mc = mchars_alloc(); |
mc = mchars_alloc(); |
|
|
ohash_init(&inos, 6, &ino_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 422 main(int argc, char *argv[]) |
|
Line 427 main(int argc, char *argv[]) |
|
if (OP_TEST != op) |
if (OP_TEST != op) |
dbprune(); |
dbprune(); |
if (OP_DELETE != op) |
if (OP_DELETE != op) |
ofmerge(mc, mp, 0); |
mpages_merge(mc, mp, 0); |
dbclose(1); |
dbclose(1); |
} else { |
} else { |
/* |
/* |
Line 453 main(int argc, char *argv[]) |
|
Line 458 main(int argc, char *argv[]) |
|
continue; |
continue; |
|
|
if (j) { |
if (j) { |
ohash_init(&inos, 6, &ino_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 466 main(int argc, char *argv[]) |
|
Line 471 main(int argc, char *argv[]) |
|
if (0 == dbopen(0)) |
if (0 == dbopen(0)) |
goto out; |
goto out; |
|
|
ofmerge(mc, mp, warnings && !use_all); |
mpages_merge(mc, mp, warnings && !use_all); |
dbclose(0); |
dbclose(0); |
|
|
if (j + 1 < dirs.sz) { |
if (j + 1 < dirs.sz) { |
ohash_delete(&inos); |
mpages_free(); |
ohash_delete(&filenames); |
ohash_delete(&mpages); |
offree(); |
ohash_delete(&mlinks); |
} |
} |
} |
} |
} |
} |
|
|
manpath_free(&dirs); |
manpath_free(&dirs); |
mchars_free(mc); |
mchars_free(mc); |
mparse_free(mp); |
mparse_free(mp); |
ohash_delete(&inos); |
mpages_free(); |
ohash_delete(&filenames); |
ohash_delete(&mpages); |
offree(); |
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 "of" 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 "of" 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 of *of) |
|
{ |
|
unsigned int slot; |
|
|
|
slot = ohash_qlookup(&filenames, of->file); |
|
assert(NULL == ohash_find(&filenames, slot)); |
|
ohash_insert(&filenames, slot, of); |
|
} |
|
|
|
/* |
|
* 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(&inos, ohash_lookup_memory( |
return(NULL != ohash_find(&mpages, ohash_lookup_memory( |
&inos, (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 of *of) |
mlink_add(int dform, const char *file, const char *name, const char *dsec, |
{ |
|
uint32_t hash; |
|
unsigned int slot; |
|
|
|
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); |
|
} |
|
|
|
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 of *of; |
struct inodev inodev; |
|
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; |
|
|
of = mandoc_calloc(1, sizeof(struct of)); |
mlink = mandoc_calloc(1, sizeof(struct mlink)); |
strlcpy(of->file, file, PATH_MAX); |
strlcpy(mlink->file, file, PATH_MAX); |
of->name = mandoc_strdup(name); |
mlink->dform = dform; |
of->sec = mandoc_strdup(sec); |
mlink->sform = sform; |
of->dsec = mandoc_strdup(dsec); |
mlink->dsec = mandoc_strdup(dsec); |
of->arch = mandoc_strdup(arch); |
mlink->arch = mandoc_strdup(arch); |
of->sform = sform; |
mlink->name = mandoc_strdup(name); |
of->dform = dform; |
mlink->fsec = mandoc_strdup(sec); |
of->next = ofs; |
|
ofs = of; |
|
|
|
/* |
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, of); |
inodev.st_dev = st->st_dev; |
fileadd(of); |
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 |
offree(void) |
mlink_free(struct mlink *mlink) |
{ |
{ |
struct of *of; |
|
|
|
while (NULL != (of = ofs)) { |
free(mlink->dsec); |
ofs = of->next; |
free(mlink->arch); |
free(of->name); |
free(mlink->name); |
free(of->sec); |
free(mlink->fsec); |
free(of->dsec); |
free(mlink); |
free(of->arch); |
} |
free(of); |
|
|
static void |
|
mpages_free(void) |
|
{ |
|
struct mpage *mpage; |
|
struct mlink *mlink; |
|
unsigned int slot; |
|
|
|
mpage = ohash_first(&mpages, &slot); |
|
while (NULL != mpage) { |
|
while (NULL != (mlink = mpage->mlinks)) { |
|
mpage->mlinks = NULL; |
|
mlink_free(mlink); |
|
} |
|
free(mpage->sec); |
|
free(mpage->arch); |
|
free(mpage->title); |
|
free(mpage->desc); |
|
free(mpage); |
|
mpage = ohash_next(&mpages, &slot); |
} |
} |
} |
} |
|
|
/* |
/* |
* Run through the files in the global vector "ofs" 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. |
*/ |
*/ |
static void |
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 title_table; |
struct ohash_info title_info, str_info; |
struct ohash_info title_info, str_info; |
char buf[PATH_MAX]; |
char buf[PATH_MAX]; |
struct of *of; |
struct mpage *mpage; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
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 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 902 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
ohash_init(&title_table, 6, &title_info); |
ohash_init(&title_table, 6, &title_info); |
} |
} |
|
|
for (of = ofs; NULL != of; of = of->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 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 911 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
* 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 == of->dform) { |
if ( ! use_all && FORM_CAT == mpage->mlinks->dform) { |
sz = strlcpy(buf, of->file, PATH_MAX); |
sz = strlcpy(buf, mpage->mlinks->file, PATH_MAX); |
if (sz >= PATH_MAX) { |
if (sz >= PATH_MAX) { |
if (warnings) |
if (warnings) |
say(of->file, "Filename too long"); |
say(mpage->mlinks->file, |
|
"Filename too long"); |
|
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
} |
} |
bufp = strstr(buf, "cat"); |
bufp = strstr(buf, "cat"); |
Line 937 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 925 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
memcpy(bufp, "man", 3); |
memcpy(bufp, "man", 3); |
if (NULL != (bufp = strrchr(buf, '.'))) |
if (NULL != (bufp = strrchr(buf, '.'))) |
*++bufp = '\0'; |
*++bufp = '\0'; |
strlcat(buf, of->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(of->file, "Man " |
say(mpage->mlinks->file, "Man " |
"source exists: %s", buf); |
"source exists: %s", buf); |
|
mpage = ohash_next(&mpages, &pslot); |
continue; |
continue; |
} |
} |
} |
} |
Line 950 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 940 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
mparse_reset(mp); |
mparse_reset(mp); |
mdoc = NULL; |
mdoc = NULL; |
man = NULL; |
man = NULL; |
form = 0; |
|
msec = of->dsec; |
|
march = of->arch; |
|
mtitle = of->name; |
|
match = 1; |
match = 1; |
|
|
/* |
/* |
Line 961 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 947 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
* 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_SRC == of->dform || FORM_SRC == of->sform) { |
if (FORM_CAT != mpage->mlinks->dform || |
lvl = mparse_readfd(mp, -1, of->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 = ""; |
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 { |
|
mpage->form = FORM_CAT; |
|
mpage->sec = |
|
mandoc_strdup(mpage->mlinks->dsec); |
|
mpage->arch = |
|
mandoc_strdup(mpage->mlinks->arch); |
|
mpage->title = |
|
mandoc_strdup(mpage->mlinks->name); |
|
} |
|
|
if (NULL == msec) |
|
msec = ""; |
|
if (NULL == march) |
|
march = ""; |
|
if (NULL == mtitle) |
|
mtitle = ""; |
|
|
|
/* |
/* |
* Check whether the manual section given in a file |
* 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 995 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 991 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
* 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, of->dsec)) { |
strcasecmp(mpage->sec, mpage->mlinks->dsec)) { |
match = 0; |
match = 0; |
say(of->file, "Section \"%s\" " |
say(mpage->mlinks->file, "Section \"%s\" " |
"manual in %s directory", |
"manual in %s directory", |
msec, of->dsec); |
mpage->sec, mpage->mlinks->dsec); |
} |
} |
|
|
/* |
/* |
Line 1017 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 1013 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
* 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, of->arch)) { |
if (warnings && !use_all && |
|
strcasecmp(mpage->arch, mpage->mlinks->arch)) { |
match = 0; |
match = 0; |
say(of->file, "Architecture \"%s\" " |
say(mpage->mlinks->file, "Architecture \"%s\" " |
"manual in \"%s\" directory", |
"manual in \"%s\" directory", |
march, of->arch); |
mpage->arch, mpage->mlinks->arch); |
} |
} |
if (warnings && !use_all && strcasecmp(mtitle, of->name)) |
if (warnings && !use_all && |
|
strcasecmp(mpage->title, mpage->mlinks->name)) |
match = 0; |
match = 0; |
|
|
putkey(of, of->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)) |
putkey(of, cp, TYPE_Nm); |
putkey(mpage, cp, TYPE_Nm); |
assert(NULL == of->desc); |
assert(NULL == mpage->desc); |
parse_mdoc(of, mdoc_node(mdoc)); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
putkey(of, NULL != of->desc ? |
putkey(mpage, NULL != mpage->desc ? |
of->desc : of->name, TYPE_Nd); |
mpage->desc : mpage->mlinks->name, TYPE_Nd); |
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(of, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
parse_catpage(of); |
parse_cat(mpage); |
|
|
/* |
/* |
* Build a title string for the file. If it matches |
* Build a title string for the file. If it matches |
Line 1047 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 1045 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
*/ |
*/ |
|
|
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 ? "" : of->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 1069 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 1069 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
} |
} |
} |
} |
|
|
dbindex(mc, form, of); |
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 1083 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
Line 1084 ofmerge(struct mchars *mc, struct mparse *mp, int chec |
|
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); |
} |
} |
} |
} |
|
|
static void |
static void |
parse_catpage(struct of *of) |
parse_cat(struct mpage *mpage) |
{ |
{ |
FILE *stream; |
FILE *stream; |
char *line, *p, *title; |
char *line, *p, *title; |
size_t len, plen, titlesz; |
size_t len, plen, titlesz; |
|
|
if (NULL == (stream = fopen(of->file, "r"))) { |
if (NULL == (stream = fopen(mpage->mlinks->file, "r"))) { |
if (warnings) |
if (warnings) |
say(of->file, NULL); |
say(mpage->mlinks->file, NULL); |
return; |
return; |
} |
} |
|
|
Line 1151 parse_catpage(struct of *of) |
|
Line 1152 parse_catpage(struct of *of) |
|
|
|
if (NULL == title || '\0' == *title) { |
if (NULL == title || '\0' == *title) { |
if (warnings) |
if (warnings) |
say(of->file, "Cannot find NAME section"); |
say(mpage->mlinks->file, |
assert(NULL == of->desc); |
"Cannot find NAME section"); |
of->desc = mandoc_strdup(of->name); |
assert(NULL == mpage->desc); |
putkey(of, of->name, TYPE_Nd); |
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
|
putkey(mpage, mpage->mlinks->name, TYPE_Nd); |
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
return; |
return; |
Line 1174 parse_catpage(struct of *of) |
|
Line 1176 parse_catpage(struct of *of) |
|
/* Skip to next word. */ ; |
/* Skip to next word. */ ; |
} else { |
} else { |
if (warnings) |
if (warnings) |
say(of->file, "No dash in title line"); |
say(mpage->mlinks->file, |
|
"No dash in title line"); |
p = title; |
p = title; |
} |
} |
|
|
Line 1192 parse_catpage(struct of *of) |
|
Line 1195 parse_catpage(struct of *of) |
|
plen -= 2; |
plen -= 2; |
} |
} |
|
|
assert(NULL == of->desc); |
assert(NULL == mpage->desc); |
of->desc = mandoc_strdup(p); |
mpage->desc = mandoc_strdup(p); |
putkey(of, of->desc, TYPE_Nd); |
putkey(mpage, mpage->desc, TYPE_Nd); |
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
} |
} |
Line 1203 parse_catpage(struct of *of) |
|
Line 1206 parse_catpage(struct of *of) |
|
* Put a type/word pair into the word database for this particular file. |
* Put a type/word pair into the word database for this particular file. |
*/ |
*/ |
static void |
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); |
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(). |
* Grok all nodes at or below a certain mdoc node into putkey(). |
*/ |
*/ |
static void |
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) { |
for ( ; NULL != n; n = n->next) { |
if (NULL != n->child) |
if (NULL != n->child) |
putmdockey(of, n->child, m); |
putmdockey(mpage, n->child, m); |
if (MDOC_TEXT == n->type) |
if (MDOC_TEXT == n->type) |
putkey(of, n->string, m); |
putkey(mpage, n->string, m); |
} |
} |
} |
} |
|
|
static void |
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; |
const struct man_node *head, *body; |
char *start, *sv, *title; |
char *start, *sv, *title; |
Line 1321 parse_man(struct of *of, const struct man_node *n) |
|
Line 1325 parse_man(struct of *of, const struct man_node *n) |
|
byte = start[sz]; |
byte = start[sz]; |
start[sz] = '\0'; |
start[sz] = '\0'; |
|
|
putkey(of, start, TYPE_Nm); |
putkey(mpage, start, TYPE_Nm); |
|
|
if (' ' == byte) { |
if (' ' == byte) { |
start += sz + 1; |
start += sz + 1; |
Line 1335 parse_man(struct of *of, const struct man_node *n) |
|
Line 1339 parse_man(struct of *of, const struct man_node *n) |
|
} |
} |
|
|
if (sv == start) { |
if (sv == start) { |
putkey(of, start, TYPE_Nm); |
putkey(mpage, start, TYPE_Nm); |
free(title); |
free(title); |
return; |
return; |
} |
} |
Line 1357 parse_man(struct of *of, const struct man_node *n) |
|
Line 1361 parse_man(struct of *of, const struct man_node *n) |
|
while (' ' == *start) |
while (' ' == *start) |
start++; |
start++; |
|
|
assert(NULL == of->desc); |
assert(NULL == mpage->desc); |
of->desc = mandoc_strdup(start); |
mpage->desc = mandoc_strdup(start); |
putkey(of, of->desc, TYPE_Nd); |
putkey(mpage, mpage->desc, TYPE_Nd); |
free(title); |
free(title); |
return; |
return; |
} |
} |
} |
} |
|
|
for (n = n->child; n; n = n->next) |
for (n = n->child; n; n = n->next) { |
parse_man(of, n); |
if (NULL != mpage->desc) |
|
break; |
|
parse_man(mpage, n); |
|
} |
} |
} |
|
|
static void |
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); |
assert(NULL != n); |
Line 1386 parse_mdoc(struct of *of, const struct mdoc_node *n) |
|
Line 1393 parse_mdoc(struct of *of, const struct mdoc_node *n) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TAIL): |
case (MDOC_TAIL): |
if (NULL != mdocs[n->tok].fp) |
if (NULL != mdocs[n->tok].fp) |
if (0 == (*mdocs[n->tok].fp)(of, n)) |
if (0 == (*mdocs[n->tok].fp)(mpage, n)) |
break; |
break; |
if (mdocs[n->tok].mask) |
if (mdocs[n->tok].mask) |
putmdockey(of, n->child, mdocs[n->tok].mask); |
putmdockey(mpage, n->child, |
|
mdocs[n->tok].mask); |
break; |
break; |
default: |
default: |
assert(MDOC_ROOT != n->type); |
assert(MDOC_ROOT != n->type); |
continue; |
continue; |
} |
} |
if (NULL != n->child) |
if (NULL != n->child) |
parse_mdoc(of, n); |
parse_mdoc(mpage, n); |
} |
} |
} |
} |
|
|
static int |
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; |
const char *start, *end; |
size_t sz; |
size_t sz; |
Line 1439 parse_mdoc_Fd(struct of *of, const struct mdoc_node *n |
|
Line 1447 parse_mdoc_Fd(struct of *of, const struct mdoc_node *n |
|
end--; |
end--; |
|
|
if (end > start) |
if (end > start) |
putkeys(of, start, end - start + 1, TYPE_In); |
putkeys(mpage, start, end - start + 1, TYPE_In); |
return(1); |
return(1); |
} |
} |
|
|
static int |
static int |
parse_mdoc_In(struct of *of, const struct mdoc_node *n) |
parse_mdoc_In(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
|
|
if (NULL != n->child && MDOC_TEXT == n->child->type) |
if (NULL != n->child && MDOC_TEXT == n->child->type) |
return(0); |
return(0); |
|
|
putkey(of, n->child->string, TYPE_In); |
putkey(mpage, n->child->string, TYPE_In); |
return(1); |
return(1); |
} |
} |
|
|
static int |
static int |
parse_mdoc_Fn(struct of *of, const struct mdoc_node *n) |
parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
const char *cp; |
const char *cp; |
|
|
Line 1475 parse_mdoc_Fn(struct of *of, const struct mdoc_node *n |
|
Line 1483 parse_mdoc_Fn(struct of *of, const struct mdoc_node *n |
|
while ('*' == *cp) |
while ('*' == *cp) |
cp++; |
cp++; |
|
|
putkey(of, cp, TYPE_Fn); |
putkey(mpage, cp, TYPE_Fn); |
|
|
if (n->string < cp) |
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) |
for (n = n->next; NULL != n; n = n->next) |
if (MDOC_TEXT == n->type) |
if (MDOC_TEXT == n->type) |
putkey(of, n->string, TYPE_Fa); |
putkey(mpage, n->string, TYPE_Fa); |
|
|
return(0); |
return(0); |
} |
} |
|
|
static int |
static int |
parse_mdoc_St(struct of *of, const struct mdoc_node *n) |
parse_mdoc_St(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
|
|
if (NULL == n->child || MDOC_TEXT != n->child->type) |
if (NULL == n->child || MDOC_TEXT != n->child->type) |
return(0); |
return(0); |
|
|
putkey(of, n->child->string, TYPE_St); |
putkey(mpage, n->child->string, TYPE_St); |
return(1); |
return(1); |
} |
} |
|
|
static int |
static int |
parse_mdoc_Xr(struct of *of, const struct mdoc_node *n) |
parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n) |
{ |
{ |
char *cp; |
char *cp; |
|
|
Line 1507 parse_mdoc_Xr(struct of *of, const struct mdoc_node *n |
|
Line 1515 parse_mdoc_Xr(struct of *of, const struct mdoc_node *n |
|
return(0); |
return(0); |
|
|
if (NULL == n->next) { |
if (NULL == n->next) { |
putkey(of, n->string, TYPE_Xr); |
putkey(mpage, n->string, TYPE_Xr); |
return(0); |
return(0); |
} |
} |
|
|
Line 1515 parse_mdoc_Xr(struct of *of, const struct mdoc_node *n |
|
Line 1523 parse_mdoc_Xr(struct of *of, const struct mdoc_node *n |
|
perror(NULL); |
perror(NULL); |
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
putkey(of, cp, TYPE_Xr); |
putkey(mpage, cp, TYPE_Xr); |
free(cp); |
free(cp); |
return(0); |
return(0); |
} |
} |
|
|
static int |
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; |
size_t sz; |
|
|
Line 1535 parse_mdoc_Nd(struct of *of, const struct mdoc_node *n |
|
Line 1543 parse_mdoc_Nd(struct of *of, const struct mdoc_node *n |
|
|
|
for (n = n->child; NULL != n; n = n->next) { |
for (n = n->child; NULL != n; n = n->next) { |
if (MDOC_TEXT == n->type) { |
if (MDOC_TEXT == n->type) { |
if (NULL != of->desc) { |
if (NULL != mpage->desc) { |
sz = strlen(of->desc) + |
sz = strlen(mpage->desc) + |
strlen(n->string) + 2; |
strlen(n->string) + 2; |
of->desc = mandoc_realloc(of->desc, sz); |
mpage->desc = mandoc_realloc( |
strlcat(of->desc, " ", sz); |
mpage->desc, sz); |
strlcat(of->desc, n->string, sz); |
strlcat(mpage->desc, " ", sz); |
|
strlcat(mpage->desc, n->string, sz); |
} else |
} else |
of->desc = mandoc_strdup(n->string); |
mpage->desc = mandoc_strdup(n->string); |
} |
} |
if (NULL != n->child) |
if (NULL != n->child) |
parse_mdoc_Nd(of, n); |
parse_mdoc_Nd(mpage, n); |
} |
} |
return(1); |
return(1); |
} |
} |
|
|
static int |
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) |
if (SEC_NAME == n->sec) |
Line 1563 parse_mdoc_Nm(struct of *of, const struct mdoc_node *n |
|
Line 1572 parse_mdoc_Nm(struct of *of, const struct mdoc_node *n |
|
} |
} |
|
|
static int |
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); |
return(SEC_CUSTOM == n->sec && MDOC_HEAD == n->type); |
} |
} |
|
|
static int |
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); |
return(MDOC_HEAD == n->type); |
} |
} |
|
|
static int |
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); |
return(MDOC_BODY == n->type); |
Line 1589 parse_mdoc_body(struct of *of, const struct mdoc_node |
|
Line 1598 parse_mdoc_body(struct of *of, const struct mdoc_node |
|
* When we finish the manual, we'll dump the table. |
* When we finish the manual, we'll dump the table. |
*/ |
*/ |
static void |
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; |
struct str *s; |
unsigned int slot; |
unsigned int slot; |
Line 1602 putkeys(const struct of *of, const char *cp, size_t sz |
|
Line 1612 putkeys(const struct of *of, const char *cp, size_t sz |
|
slot = ohash_qlookupi(&strings, cp, &end); |
slot = ohash_qlookupi(&strings, cp, &end); |
s = ohash_find(&strings, slot); |
s = ohash_find(&strings, slot); |
|
|
if (NULL != s && of == s->of) { |
if (NULL != s && mpage == s->mpage) { |
s->mask |= v; |
s->mask |= v; |
return; |
return; |
} else if (NULL == s) { |
} else if (NULL == s) { |
Line 1610 putkeys(const struct of *of, const char *cp, size_t sz |
|
Line 1620 putkeys(const struct of *of, const char *cp, size_t sz |
|
memcpy(s->key, cp, sz); |
memcpy(s->key, cp, sz); |
ohash_insert(&strings, slot, s); |
ohash_insert(&strings, slot, s); |
} |
} |
s->of = of; |
s->mpage = mpage; |
s->mask = v; |
s->mask = v; |
} |
} |
|
|
Line 1777 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 of *of) |
dbindex(const struct mpage *mpage, struct mchars *mc) |
{ |
{ |
struct str *key; |
struct str *key; |
const char *desc; |
const char *desc; |
Line 1786 dbindex(struct mchars *mc, int form, const struct of * |
|
Line 1796 dbindex(struct mchars *mc, int form, const struct of * |
|
unsigned int slot; |
unsigned int slot; |
|
|
if (verb) |
if (verb) |
say(of->file, "Adding to index"); |
say(mpage->mlinks->file, "Adding to index"); |
|
|
if (nodb) |
if (nodb) |
return; |
return; |
|
|
desc = ""; |
desc = ""; |
if (NULL != of->desc && '\0' != *of->desc) { |
if (NULL != mpage->desc && '\0' != *mpage->desc) { |
key = ohash_find(&strings, |
key = ohash_find(&strings, |
ohash_qlookup(&strings, of->desc)); |
ohash_qlookup(&strings, mpage->desc)); |
assert(NULL != key); |
assert(NULL != key); |
if (NULL == key->utf8) |
if (NULL == key->utf8) |
utf8key(mc, key); |
utf8key(mc, key); |
Line 1804 dbindex(struct mchars *mc, int form, const struct of * |
|
Line 1814 dbindex(struct mchars *mc, int form, const struct of * |
|
SQL_EXEC("BEGIN TRANSACTION"); |
SQL_EXEC("BEGIN TRANSACTION"); |
|
|
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->file); |
/* |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->sec); |
* XXX The following three lines are obsolete |
SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, of->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->of == of); |
assert(key->mpage == mpage); |
if (NULL == key->utf8) |
if (NULL == key->utf8) |
utf8key(mc, key); |
utf8key(mc, key); |
i = 1; |
i = 1; |
Line 1835 dbindex(struct mchars *mc, int form, const struct of * |
|
Line 1858 dbindex(struct mchars *mc, int form, const struct of * |
|
static void |
static void |
dbprune(void) |
dbprune(void) |
{ |
{ |
struct of *of; |
struct mpage *mpage; |
|
struct mlink *mlink; |
size_t i; |
size_t i; |
|
unsigned int slot; |
|
|
if (nodb) |
if (nodb) |
return; |
return; |
|
|
for (of = ofs; NULL != of; of = of->next) { |
mpage = ohash_first(&mpages, &slot); |
|
while (NULL != mpage) { |
|
mlink = mpage->mlinks; |
i = 1; |
i = 1; |
SQL_BIND_TEXT(stmts[STMT_DELETE], i, of->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(of->file, "Deleted from index"); |
say(mlink->file, "Deleted from index"); |
|
mpage = ohash_next(&mpages, &slot); |
} |
} |
} |
} |
|
|
Line 1927 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 1936 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 1954 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__ |