version 1.115, 2014/03/18 16:56:10 |
version 1.119, 2014/03/23 11:25:26 |
|
|
#include "mdoc.h" |
#include "mdoc.h" |
#include "man.h" |
#include "man.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "manpath.h" |
#include "manpath.h" |
#include "mansearch.h" |
#include "mansearch.h" |
|
|
|
|
|
|
struct mpage { |
struct mpage { |
struct inodev inodev; /* used for hashing routine */ |
struct inodev inodev; /* used for hashing routine */ |
|
int64_t recno; /* id in mpages SQL table */ |
enum form form; /* format from file content */ |
enum form form; /* format from file content */ |
char *sec; /* section from file content */ |
char *sec; /* section from file content */ |
char *arch; /* architecture from file content */ |
char *arch; /* architecture from file content */ |
|
|
char *name; /* name from file name (not empty) */ |
char *name; /* name from file name (not empty) */ |
char *fsec; /* section from file name suffix */ |
char *fsec; /* section from file name suffix */ |
struct mlink *next; /* singly linked list */ |
struct mlink *next; /* singly linked list */ |
|
struct mpage *mpage; /* parent */ |
}; |
}; |
|
|
enum stmt { |
enum stmt { |
Line 134 struct mdoc_handler { |
|
Line 137 struct mdoc_handler { |
|
}; |
}; |
|
|
static void dbclose(int); |
static void dbclose(int); |
static void dbadd(const struct mpage *, struct mchars *); |
static void dbadd(struct mpage *, struct mchars *); |
|
static void dbadd_mlink(const struct mlink *mlink); |
static int dbopen(int); |
static int dbopen(int); |
static void dbprune(void); |
static void dbprune(void); |
static void filescan(const char *); |
static void filescan(const char *); |
Line 172 static size_t utf8(unsigned int, char [7]); |
|
Line 176 static size_t utf8(unsigned int, char [7]); |
|
static char tempfilename[32]; |
static char tempfilename[32]; |
static char *progname; |
static char *progname; |
static int nodb; /* no database changes */ |
static int nodb; /* no database changes */ |
static int quick; /* abort the parse early */ |
static int mparse_options; /* abort the parse early */ |
static int use_all; /* use all found files */ |
static int use_all; /* use all found files */ |
static int verb; /* print what we're doing */ |
static int verb; /* print what we're doing */ |
static int warnings; /* warn about crap */ |
static int warnings; /* warn about crap */ |
Line 371 main(int argc, char *argv[]) |
|
Line 375 main(int argc, char *argv[]) |
|
nodb = 1; |
nodb = 1; |
break; |
break; |
case ('Q'): |
case ('Q'): |
quick = 1; |
mparse_options |= MPARSE_QUICK; |
break; |
break; |
case ('T'): |
case ('T'): |
if (strcmp(optarg, "utf8")) { |
if (strcmp(optarg, "utf8")) { |
Line 411 main(int argc, char *argv[]) |
|
Line 415 main(int argc, char *argv[]) |
|
} |
} |
|
|
exitcode = (int)MANDOCLEVEL_OK; |
exitcode = (int)MANDOCLEVEL_OK; |
mp = mparse_alloc(MPARSE_AUTO, |
mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, NULL); |
MANDOCLEVEL_FATAL, NULL, NULL, quick); |
|
mc = mchars_alloc(); |
mc = mchars_alloc(); |
|
|
ohash_init(&mpages, 6, &mpages_info); |
ohash_init(&mpages, 6, &mpages_info); |
Line 818 mlink_add(struct mlink *mlink, const struct stat *st) |
|
Line 821 mlink_add(struct mlink *mlink, const struct stat *st) |
|
} else |
} else |
mlink->next = mpage->mlinks; |
mlink->next = mpage->mlinks; |
mpage->mlinks = mlink; |
mpage->mlinks = mlink; |
|
mlink->mpage = mpage; |
} |
} |
|
|
static void |
static void |
Line 960 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 964 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
{ |
{ |
char any[] = "any"; |
char any[] = "any"; |
struct ohash_info str_info; |
struct ohash_info str_info; |
struct mpage *mpage; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink; |
struct mlink *mlink, *mlink_dest; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
|
char *sodest; |
char *cp; |
char *cp; |
int match; |
int match; |
unsigned int pslot; |
unsigned int pslot; |
Line 999 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1004 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
FORM_CAT != mpage->mlinks->fform) { |
FORM_CAT != mpage->mlinks->fform) { |
lvl = mparse_readfd(mp, -1, mpage->mlinks->file); |
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, &sodest); |
} |
} |
|
|
if (NULL != mdoc) { |
if (NULL != sodest) { |
|
mlink_dest = ohash_find(&mlinks, |
|
ohash_qlookup(&mlinks, sodest)); |
|
if (NULL != mlink_dest) { |
|
|
|
/* The .so target exists. */ |
|
|
|
mpage_dest = mlink_dest->mpage; |
|
mlink = mpage->mlinks; |
|
while (1) { |
|
mlink->mpage = mpage_dest; |
|
|
|
/* |
|
* If the target was already |
|
* processed, add the links |
|
* to the database now. |
|
* Otherwise, this will |
|
* happen when we come |
|
* to the target. |
|
*/ |
|
|
|
if (mpage_dest->recno) |
|
dbadd_mlink(mlink); |
|
|
|
if (NULL == mlink->next) |
|
break; |
|
mlink = mlink->next; |
|
} |
|
|
|
/* Move all links to the target. */ |
|
|
|
mlink->next = mlink_dest->next; |
|
mlink_dest->next = mpage->mlinks; |
|
mpage->mlinks = NULL; |
|
} |
|
ohash_delete(&strings); |
|
mpage = ohash_next(&mpages, &pslot); |
|
continue; |
|
} else if (NULL != mdoc) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = |
mpage->sec = |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
mandoc_strdup(mdoc_meta(mdoc)->msec); |
Line 1779 render_key(struct mchars *mc, struct str *key) |
|
Line 1822 render_key(struct mchars *mc, struct str *key) |
|
key->rendered = buf; |
key->rendered = buf; |
} |
} |
|
|
|
static void |
|
dbadd_mlink(const struct mlink *mlink) |
|
{ |
|
size_t i; |
|
|
|
i = 1; |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name); |
|
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->recno); |
|
SQL_STEP(stmts[STMT_INSERT_LINK]); |
|
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
} |
|
|
/* |
/* |
* Flush the current page's terms (and their bits) into the database. |
* Flush the current page's terms (and their bits) into the database. |
* Wrap the entire set of additions in a transaction to make sqlite be a |
* Wrap the entire set of additions in a transaction to make sqlite be a |
Line 1786 render_key(struct mchars *mc, struct str *key) |
|
Line 1843 render_key(struct mchars *mc, struct str *key) |
|
* Also, handle escape sequences at the last possible moment. |
* Also, handle escape sequences at the last possible moment. |
*/ |
*/ |
static void |
static void |
dbadd(const struct mpage *mpage, struct mchars *mc) |
dbadd(struct mpage *mpage, struct mchars *mc) |
{ |
{ |
struct mlink *mlink; |
struct mlink *mlink; |
struct str *key; |
struct str *key; |
int64_t recno; |
|
size_t i; |
size_t i; |
unsigned int slot; |
unsigned int slot; |
|
|
Line 1803 dbadd(const struct mpage *mpage, struct mchars *mc) |
|
Line 1859 dbadd(const struct mpage *mpage, struct mchars *mc) |
|
i = 1; |
i = 1; |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
recno = sqlite3_last_insert_rowid(db); |
mpage->recno = sqlite3_last_insert_rowid(db); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
sqlite3_reset(stmts[STMT_INSERT_PAGE]); |
|
|
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { |
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) |
i = 1; |
dbadd_mlink(mlink); |
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch); |
|
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name); |
|
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno); |
|
SQL_STEP(stmts[STMT_INSERT_LINK]); |
|
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
} |
|
|
|
for (key = ohash_first(&strings, &slot); NULL != key; |
for (key = ohash_first(&strings, &slot); NULL != key; |
key = ohash_next(&strings, &slot)) { |
key = ohash_next(&strings, &slot)) { |
Line 1824 dbadd(const struct mpage *mpage, struct mchars *mc) |
|
Line 1873 dbadd(const struct mpage *mpage, struct mchars *mc) |
|
i = 1; |
i = 1; |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask); |
SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered); |
SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, recno); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, mpage->recno); |
SQL_STEP(stmts[STMT_INSERT_KEY]); |
SQL_STEP(stmts[STMT_INSERT_KEY]); |
sqlite3_reset(stmts[STMT_INSERT_KEY]); |
sqlite3_reset(stmts[STMT_INSERT_KEY]); |
if (key->rendered != key->key) |
if (key->rendered != key->key) |
Line 1985 dbopen(int real) |
|
Line 2034 dbopen(int real) |
|
rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL); |
rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL); |
if (SQLITE_OK == rc) |
if (SQLITE_OK == rc) |
goto create_tables; |
goto create_tables; |
if (quick) { |
if (MPARSE_QUICK & mparse_options) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(MANDOC_DB "~", "%s", sqlite3_errmsg(db)); |
say(MANDOC_DB "~", "%s", sqlite3_errmsg(db)); |
return(0); |
return(0); |