version 1.166, 2014/10/12 20:32:39 |
version 1.170, 2014/11/26 21:40:17 |
Line 138 struct mdoc_handler { |
|
Line 138 struct mdoc_handler { |
|
static void dbclose(int); |
static void dbclose(int); |
static void dbadd(struct mpage *, struct mchars *); |
static void dbadd(struct mpage *, struct mchars *); |
static void dbadd_mlink(const struct mlink *mlink); |
static void dbadd_mlink(const struct mlink *mlink); |
|
static void dbadd_mlink_name(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 425 main(int argc, char *argv[]) |
|
Line 426 main(int argc, char *argv[]) |
|
} |
} |
|
|
exitcode = (int)MANDOCLEVEL_OK; |
exitcode = (int)MANDOCLEVEL_OK; |
mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, NULL); |
|
mc = mchars_alloc(); |
mc = mchars_alloc(); |
|
mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, |
|
mc, NULL); |
ohash_init(&mpages, 6, &mpages_info); |
ohash_init(&mpages, 6, &mpages_info); |
ohash_init(&mlinks, 6, &mlinks_info); |
ohash_init(&mlinks, 6, &mlinks_info); |
|
|
Line 525 main(int argc, char *argv[]) |
|
Line 526 main(int argc, char *argv[]) |
|
} |
} |
out: |
out: |
manpath_free(&dirs); |
manpath_free(&dirs); |
mchars_free(mc); |
|
mparse_free(mp); |
mparse_free(mp); |
|
mchars_free(mc); |
mpages_free(); |
mpages_free(); |
ohash_delete(&mpages); |
ohash_delete(&mpages); |
ohash_delete(&mlinks); |
ohash_delete(&mlinks); |
Line 1083 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1084 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
struct man *man; |
struct man *man; |
char *sodest; |
char *sodest; |
char *cp; |
char *cp; |
pid_t child_pid; |
|
int fd; |
int fd; |
unsigned int pslot; |
unsigned int pslot; |
enum mandoclevel lvl; |
enum mandoclevel lvl; |
Line 1111 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1111 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
mdoc = NULL; |
mdoc = NULL; |
man = NULL; |
man = NULL; |
sodest = NULL; |
sodest = NULL; |
child_pid = 0; |
|
|
|
mparse_open(mp, &fd, mpage->mlinks->file, &child_pid); |
mparse_open(mp, &fd, mpage->mlinks->file); |
if (fd == -1) { |
if (fd == -1) { |
say(mpage->mlinks->file, "&open"); |
say(mpage->mlinks->file, "&open"); |
goto nextpage; |
goto nextpage; |
Line 1153 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1152 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
*/ |
*/ |
|
|
if (mpage_dest->pageid) |
if (mpage_dest->pageid) |
dbadd_mlink(mlink); |
dbadd_mlink_name(mlink); |
|
|
if (NULL == mlink->next) |
if (NULL == mlink->next) |
break; |
break; |
Line 1230 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1229 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
dbadd(mpage, mc); |
dbadd(mpage, mc); |
|
|
nextpage: |
nextpage: |
if (child_pid && |
if (mparse_wait(mp) != MANDOCLEVEL_OK) { |
mparse_wait(mp, child_pid) != MANDOCLEVEL_OK) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |
say(mpage->mlinks->file, "&wait gunzip"); |
say(mpage->mlinks->file, "&wait gunzip"); |
} |
} |
Line 1728 putkeys(const struct mpage *mpage, |
|
Line 1726 putkeys(const struct mpage *mpage, |
|
if (TYPE_Nm & v) { |
if (TYPE_Nm & v) { |
htab = &names; |
htab = &names; |
v &= name_mask; |
v &= name_mask; |
name_mask &= ~NAME_FIRST; |
if (v & NAME_FIRST) |
|
name_mask &= ~NAME_FIRST; |
if (debug > 1) |
if (debug > 1) |
say(mpage->mlinks->file, |
say(mpage->mlinks->file, |
"Adding name %*s", sz, cp); |
"Adding name %*s", sz, cp); |
Line 1903 render_key(struct mchars *mc, struct str *key) |
|
Line 1902 render_key(struct mchars *mc, struct str *key) |
|
*/ |
*/ |
|
|
if (write_utf8) { |
if (write_utf8) { |
if (0 == (u = mchars_spec2cp(mc, seq, len))) |
if ((u = mchars_spec2cp(mc, seq, len)) <= 0) |
continue; |
continue; |
cpp = utfbuf; |
cpp = utfbuf; |
if (0 == (sz = utf8(u, utfbuf))) |
if (0 == (sz = utf8(u, utfbuf))) |
Line 1943 dbadd_mlink(const struct mlink *mlink) |
|
Line 1942 dbadd_mlink(const struct mlink *mlink) |
|
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid); |
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
SQL_STEP(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
sqlite3_reset(stmts[STMT_INSERT_LINK]); |
|
} |
|
|
|
static void |
|
dbadd_mlink_name(const struct mlink *mlink) |
|
{ |
|
size_t i; |
|
|
|
dbadd_mlink(mlink); |
|
|
i = 1; |
i = 1; |
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, NAME_FILE); |
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, NAME_FILE & NAME_MASK); |
SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, mlink->name); |
SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, mlink->name); |
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mlink->mpage->pageid); |
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mlink->mpage->pageid); |
SQL_STEP(stmts[STMT_INSERT_NAME]); |
SQL_STEP(stmts[STMT_INSERT_NAME]); |