version 1.123, 2014/03/26 20:53:36 |
version 1.128, 2014/04/04 02:31:07 |
|
|
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 */ |
struct mpage *mpage; /* parent */ |
|
int gzip; /* filename has a .gz suffix */ |
}; |
}; |
|
|
enum stmt { |
enum stmt { |
Line 151 static void mlink_free(struct mlink *); |
|
Line 152 static void mlink_free(struct mlink *); |
|
static void mlinks_undupe(struct mpage *); |
static void mlinks_undupe(struct mpage *); |
static void mpages_free(void); |
static void mpages_free(void); |
static void mpages_merge(struct mchars *, struct mparse *); |
static void mpages_merge(struct mchars *, struct mparse *); |
static void parse_cat(struct mpage *); |
static void parse_cat(struct mpage *, int); |
static void parse_man(struct mpage *, const struct man_node *); |
static void parse_man(struct mpage *, const struct man_node *); |
static void parse_mdoc(struct mpage *, const struct mdoc_node *); |
static void parse_mdoc(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_body(struct mpage *, const struct mdoc_node *); |
static int parse_mdoc_body(struct mpage *, const struct mdoc_node *); |
Line 178 static char *progname; |
|
Line 179 static char *progname; |
|
static int nodb; /* no database changes */ |
static int nodb; /* no database changes */ |
static int mparse_options; /* 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 debug; /* print what we're doing */ |
static int warnings; /* warn about crap */ |
static int warnings; /* warn about crap */ |
static int write_utf8; /* write UTF-8 output; else ASCII */ |
static int write_utf8; /* write UTF-8 output; else ASCII */ |
static int exitcode; /* to be returned by main */ |
static int exitcode; /* to be returned by main */ |
Line 356 main(int argc, char *argv[]) |
|
Line 357 main(int argc, char *argv[]) |
|
path_arg = NULL; |
path_arg = NULL; |
op = OP_DEFAULT; |
op = OP_DEFAULT; |
|
|
while (-1 != (ch = getopt(argc, argv, "aC:d:nQT:tu:vW"))) |
while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v"))) |
switch (ch) { |
switch (ch) { |
case ('a'): |
case ('a'): |
use_all = 1; |
use_all = 1; |
Line 366 main(int argc, char *argv[]) |
|
Line 367 main(int argc, char *argv[]) |
|
path_arg = optarg; |
path_arg = optarg; |
op = OP_CONFFILE; |
op = OP_CONFFILE; |
break; |
break; |
|
case ('D'): |
|
debug++; |
|
break; |
case ('d'): |
case ('d'): |
CHECKOP(op, ch); |
CHECKOP(op, ch); |
path_arg = optarg; |
path_arg = optarg; |
Line 374 main(int argc, char *argv[]) |
|
Line 378 main(int argc, char *argv[]) |
|
case ('n'): |
case ('n'): |
nodb = 1; |
nodb = 1; |
break; |
break; |
|
case ('p'): |
|
warnings = 1; |
|
break; |
case ('Q'): |
case ('Q'): |
mparse_options |= MPARSE_QUICK; |
mparse_options |= MPARSE_QUICK; |
break; |
break; |
Line 397 main(int argc, char *argv[]) |
|
Line 404 main(int argc, char *argv[]) |
|
op = OP_DELETE; |
op = OP_DELETE; |
break; |
break; |
case ('v'): |
case ('v'): |
verb++; |
/* Compatibility with espie@'s makewhatis. */ |
break; |
break; |
case ('W'): |
|
warnings = 1; |
|
break; |
|
default: |
default: |
goto usage; |
goto usage; |
} |
} |
Line 458 main(int argc, char *argv[]) |
|
Line 462 main(int argc, char *argv[]) |
|
} else |
} else |
manpath_parse(&dirs, path_arg, NULL, NULL); |
manpath_parse(&dirs, path_arg, NULL, NULL); |
|
|
|
if (0 == dirs.sz) { |
|
exitcode = (int)MANDOCLEVEL_BADARG; |
|
say("", "Empty manpath"); |
|
} |
|
|
/* |
/* |
* First scan the tree rooted at a base directory, then |
* First scan the tree rooted at a base directory, then |
* build a new database and finally move it into place. |
* build a new database and finally move it into place. |
|
|
ohash_delete(&mlinks); |
ohash_delete(&mlinks); |
return(exitcode); |
return(exitcode); |
usage: |
usage: |
fprintf(stderr, "usage: %s [-anQvW] [-C file] [-Tutf8]\n" |
fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n" |
" %s [-anQvW] [-Tutf8] dir ...\n" |
" %s [-aDnpQ] [-Tutf8] dir ...\n" |
" %s [-nQvW] [-Tutf8] -d dir [file ...]\n" |
" %s [-DnpQ] [-Tutf8] -d dir [file ...]\n" |
" %s [-nvW] -u dir [file ...]\n" |
" %s [-Dnp] -u dir [file ...]\n" |
" %s [-Q] -t file ...\n", |
" %s [-Q] -t file ...\n", |
progname, progname, progname, |
progname, progname, progname, |
progname, progname); |
progname, progname); |
|
|
FTS *f; |
FTS *f; |
FTSENT *ff; |
FTSENT *ff; |
struct mlink *mlink; |
struct mlink *mlink; |
int dform; |
int dform, gzip; |
char *dsec, *arch, *fsec, *cp; |
char *dsec, *arch, *fsec, *cp; |
const char *path; |
const char *path; |
const char *argv[2]; |
const char *argv[2]; |
|
|
if (warnings) |
if (warnings) |
say(path, "Extraneous file"); |
say(path, "Extraneous file"); |
continue; |
continue; |
} else if (NULL == (fsec = |
} |
strrchr(ff->fts_name, '.'))) { |
gzip = 0; |
|
fsec = NULL; |
|
while (NULL == fsec) { |
|
fsec = strrchr(ff->fts_name, '.'); |
|
if (NULL == fsec || strcmp(fsec+1, "gz")) |
|
break; |
|
gzip = 1; |
|
*fsec = '\0'; |
|
fsec = NULL; |
|
} |
|
if (NULL == fsec) { |
if ( ! use_all) { |
if ( ! use_all) { |
if (warnings) |
if (warnings) |
say(path, |
say(path, |
|
|
if (warnings) |
if (warnings) |
say(path, "Skip html"); |
say(path, "Skip html"); |
continue; |
continue; |
} else if (0 == strcmp(fsec, "gz")) { |
|
if (warnings) |
|
say(path, "Skip gz"); |
|
continue; |
|
} else if (0 == strcmp(fsec, "ps")) { |
} else if (0 == strcmp(fsec, "ps")) { |
if (warnings) |
if (warnings) |
say(path, "Skip ps"); |
say(path, "Skip ps"); |
|
|
mlink->arch = arch; |
mlink->arch = arch; |
mlink->name = ff->fts_name; |
mlink->name = ff->fts_name; |
mlink->fsec = fsec; |
mlink->fsec = fsec; |
|
mlink->gzip = gzip; |
mlink_add(mlink, ff->fts_statp); |
mlink_add(mlink, ff->fts_statp); |
continue; |
continue; |
} else if (FTS_D != ff->fts_info && |
} else if (FTS_D != ff->fts_info && |
Line 964 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 980 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
{ |
{ |
char any[] = "any"; |
char any[] = "any"; |
struct ohash_info str_info; |
struct ohash_info str_info; |
|
int fd[2]; |
struct mpage *mpage, *mpage_dest; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink, *mlink_dest; |
struct mlink *mlink, *mlink_dest; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
char *sodest; |
char *sodest; |
char *cp; |
char *cp; |
int match; |
pid_t child_pid; |
|
int match, status; |
unsigned int pslot; |
unsigned int pslot; |
enum mandoclevel lvl; |
enum mandoclevel lvl; |
|
|
Line 994 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1012 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
mparse_reset(mp); |
mparse_reset(mp); |
mdoc = NULL; |
mdoc = NULL; |
man = NULL; |
man = NULL; |
|
sodest = NULL; |
|
child_pid = 0; |
|
fd[0] = -1; |
|
fd[1] = -1; |
|
|
|
if (mpage->mlinks->gzip) { |
|
if (-1 == pipe(fd)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, "&pipe gunzip"); |
|
goto nextpage; |
|
} |
|
switch (child_pid = fork()) { |
|
case (-1): |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, "&fork gunzip"); |
|
child_pid = 0; |
|
close(fd[1]); |
|
close(fd[0]); |
|
goto nextpage; |
|
case (0): |
|
close(fd[0]); |
|
if (-1 == dup2(fd[1], STDOUT_FILENO)) { |
|
say(mpage->mlinks->file, |
|
"&dup gunzip"); |
|
exit(1); |
|
} |
|
execlp("gunzip", "gunzip", "-c", |
|
mpage->mlinks->file, NULL); |
|
say(mpage->mlinks->file, "&exec gunzip"); |
|
exit(1); |
|
default: |
|
close(fd[1]); |
|
break; |
|
} |
|
} |
|
|
/* |
/* |
* Try interpreting the file as mdoc(7) or man(7) |
* Try interpreting the file as mdoc(7) or man(7) |
* source code, unless it is already known to be |
* source code, unless it is already known to be |
Line 1002 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1055 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
*/ |
*/ |
if (FORM_CAT != mpage->mlinks->dform || |
if (FORM_CAT != mpage->mlinks->dform || |
FORM_CAT != mpage->mlinks->fform) { |
FORM_CAT != mpage->mlinks->fform) { |
lvl = mparse_readfd(mp, -1, mpage->mlinks->file); |
lvl = mparse_readfd(mp, fd[0], mpage->mlinks->file); |
if (lvl < MANDOCLEVEL_FATAL) |
if (lvl < MANDOCLEVEL_FATAL) |
mparse_result(mp, &mdoc, &man, &sodest); |
mparse_result(mp, &mdoc, &man, &sodest); |
} |
} |
Line 1042 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1095 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
mlink_dest->next = mpage->mlinks; |
mlink_dest->next = mpage->mlinks; |
mpage->mlinks = NULL; |
mpage->mlinks = NULL; |
} |
} |
ohash_delete(&strings); |
goto nextpage; |
mpage = ohash_next(&mpages, &pslot); |
|
continue; |
|
} else if (NULL != mdoc) { |
} else if (NULL != mdoc) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = |
mpage->sec = |
Line 1104 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1155 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(mpage, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
parse_cat(mpage); |
parse_cat(mpage, fd[0]); |
|
|
dbadd(mpage, mc); |
dbadd(mpage, mc); |
|
|
|
nextpage: |
|
if (child_pid) { |
|
if (-1 == waitpid(child_pid, &status, 0)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, "&wait gunzip"); |
|
} else if (WIFSIGNALED(status)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, |
|
"gunzip died from signal %d", |
|
WTERMSIG(status)); |
|
} else if (WEXITSTATUS(status)) { |
|
exitcode = (int)MANDOCLEVEL_SYSERR; |
|
say(mpage->mlinks->file, |
|
"gunzip failed with code %d", |
|
WEXITSTATUS(status)); |
|
} |
|
} |
ohash_delete(&strings); |
ohash_delete(&strings); |
mpage = ohash_next(&mpages, &pslot); |
mpage = ohash_next(&mpages, &pslot); |
} |
} |
Line 1116 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1185 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
} |
} |
|
|
static void |
static void |
parse_cat(struct mpage *mpage) |
parse_cat(struct mpage *mpage, int fd) |
{ |
{ |
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(mpage->mlinks->file, "r"))) { |
stream = (-1 == fd) ? |
|
fopen(mpage->mlinks->file, "r") : |
|
fdopen(fd, "r"); |
|
if (NULL == stream) { |
if (warnings) |
if (warnings) |
say(mpage->mlinks->file, "&fopen"); |
say(mpage->mlinks->file, "&fopen"); |
return; |
return; |
Line 1559 putkeys(const struct mpage *mpage, |
|
Line 1631 putkeys(const struct mpage *mpage, |
|
if (0 == sz) |
if (0 == sz) |
return; |
return; |
|
|
if (verb > 1) { |
if (debug > 1) { |
for (i = 0, mask = 1; |
for (i = 0, mask = 1; |
i < mansearch_keymax; |
i < mansearch_keymax; |
i++, mask <<= 1) |
i++, mask <<= 1) |
Line 1786 dbadd(struct mpage *mpage, struct mchars *mc) |
|
Line 1858 dbadd(struct mpage *mpage, struct mchars *mc) |
|
size_t i; |
size_t i; |
unsigned int slot; |
unsigned int slot; |
|
|
if (verb) |
mlink = mpage->mlinks; |
say(mpage->mlinks->file, "Adding to database"); |
|
|
|
if (nodb) |
if (nodb) { |
|
while (NULL != mlink) { |
|
fputs(mlink->name, stdout); |
|
if (NULL == mlink->next || |
|
strcmp(mlink->dsec, mlink->next->dsec) || |
|
strcmp(mlink->fsec, mlink->next->fsec) || |
|
strcmp(mlink->arch, mlink->next->arch)) { |
|
putchar('('); |
|
if ('\0' == *mlink->dsec) |
|
fputs(mlink->fsec, stdout); |
|
else |
|
fputs(mlink->dsec, stdout); |
|
if ('\0' != *mlink->arch) |
|
printf("/%s", mlink->arch); |
|
putchar(')'); |
|
} |
|
mlink = mlink->next; |
|
if (NULL != mlink) |
|
fputs(", ", stdout); |
|
} |
|
for (key = ohash_first(&strings, &slot); NULL != key; |
|
key = ohash_next(&strings, &slot)) { |
|
if (TYPE_Nd & key->mask) { |
|
if (NULL == key->rendered) |
|
render_key(mc, key); |
|
printf(" - %s", key->rendered); |
|
break; |
|
} |
|
} |
|
putchar('\n'); |
return; |
return; |
|
} |
|
|
|
if (debug) |
|
say(mlink->file, "Adding to database"); |
|
|
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]); |
mpage->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) |
while (NULL != mlink) { |
dbadd_mlink(mlink); |
dbadd_mlink(mlink); |
|
mlink = mlink->next; |
|
} |
|
|
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)) { |
|
|
for (mpage = ohash_first(&mpages, &slot); NULL != mpage; |
for (mpage = ohash_first(&mpages, &slot); NULL != mpage; |
mpage = ohash_next(&mpages, &slot)) { |
mpage = ohash_next(&mpages, &slot)) { |
mlink = mpage->mlinks; |
mlink = mpage->mlinks; |
if (verb) |
if (debug) |
say(mlink->file, "Deleting from database"); |
say(mlink->file, "Deleting from database"); |
if (nodb) |
if (nodb) |
continue; |
continue; |