version 1.273.2.8, 2017/02/17 14:50:13 |
version 1.280, 2017/01/27 13:47:10 |
Line 82 struct curparse { |
|
Line 82 struct curparse { |
|
}; |
}; |
|
|
|
|
#if HAVE_SQLITE3 |
|
int mandocdb(int, char *[]); |
int mandocdb(int, char *[]); |
#endif |
|
|
|
static int fs_lookup(const struct manpaths *, |
static int fs_lookup(const struct manpaths *, |
size_t ipath, const char *, |
size_t ipath, const char *, |
Line 102 static void parse(struct curparse *, int, const cha |
|
Line 100 static void parse(struct curparse *, int, const cha |
|
static void passthrough(const char *, int, int); |
static void passthrough(const char *, int, int); |
static pid_t spawn_pager(struct tag_files *); |
static pid_t spawn_pager(struct tag_files *); |
static int toptions(struct curparse *, char *); |
static int toptions(struct curparse *, char *); |
static void usage(enum argmode) __attribute__((__noreturn__)); |
static void usage(enum argmode) __attribute__((noreturn)); |
static int woptions(struct curparse *, char *); |
static int woptions(struct curparse *, char *); |
|
|
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
|
|
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
struct manconf conf; |
struct manconf conf; |
struct mansearch search; |
|
struct curparse curp; |
struct curparse curp; |
|
struct mansearch search; |
struct tag_files *tag_files; |
struct tag_files *tag_files; |
struct manpage *res, *resp; |
const char *progname; |
const char *progname, *sec, *thisarg; |
char *auxpaths; |
char *conf_file, *defpaths, *auxpaths; |
char *defos; |
char *defos, *oarg; |
|
unsigned char *uc; |
unsigned char *uc; |
|
struct manpage *res, *resp; |
|
char *conf_file, *defpaths; |
|
const char *sec; |
|
const char *thisarg; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
Line 146 main(int argc, char *argv[]) |
|
Line 147 main(int argc, char *argv[]) |
|
setprogname(progname); |
setprogname(progname); |
#endif |
#endif |
|
|
#if HAVE_SQLITE3 |
|
if (strncmp(progname, "mandocdb", 8) == 0 || |
if (strncmp(progname, "mandocdb", 8) == 0 || |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
return mandocdb(argc, argv); |
return mandocdb(argc, argv); |
#endif |
|
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1) |
Line 170 main(int argc, char *argv[]) |
|
Line 169 main(int argc, char *argv[]) |
|
|
|
memset(&search, 0, sizeof(struct mansearch)); |
memset(&search, 0, sizeof(struct mansearch)); |
search.outkey = "Nd"; |
search.outkey = "Nd"; |
oarg = NULL; |
|
|
|
if (strcmp(progname, BINM_MAN) == 0) |
if (strcmp(progname, BINM_MAN) == 0) |
search.argmode = ARG_NAME; |
search.argmode = ARG_NAME; |
Line 249 main(int argc, char *argv[]) |
|
Line 247 main(int argc, char *argv[]) |
|
auxpaths = optarg; |
auxpaths = optarg; |
break; |
break; |
case 'O': |
case 'O': |
oarg = optarg; |
search.outkey = optarg; |
|
while (optarg != NULL) { |
|
thisarg = optarg; |
|
if (manconf_output(&conf.output, |
|
strsep(&optarg, ","), 0) == 0) |
|
continue; |
|
warnx("-O %s: Bad argument", thisarg); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
break; |
break; |
case 'S': |
case 'S': |
search.arch = optarg; |
search.arch = optarg; |
Line 294 main(int argc, char *argv[]) |
|
Line 300 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
if (oarg != NULL) { |
|
if (outmode == OUTMODE_LST) |
|
search.outkey = oarg; |
|
else { |
|
while (oarg != NULL) { |
|
thisarg = oarg; |
|
if (manconf_output(&conf.output, |
|
strsep(&oarg, ","), 0) == 0) |
|
continue; |
|
warnx("-O %s: Bad argument", thisarg); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
|
} |
|
} |
|
|
|
if (outmode == OUTMODE_FLN || |
if (outmode == OUTMODE_FLN || |
outmode == OUTMODE_LST || |
outmode == OUTMODE_LST || |
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
Line 361 main(int argc, char *argv[]) |
|
Line 352 main(int argc, char *argv[]) |
|
/* man(1), whatis(1), apropos(1) */ |
/* man(1), whatis(1), apropos(1) */ |
|
|
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
if (argc == 0) |
|
usage(search.argmode); |
|
|
|
if (search.argmode == ARG_NAME && |
if (search.argmode == ARG_NAME && |
outmode == OUTMODE_ONE) |
outmode == OUTMODE_ONE) |
search.firstmatch = 1; |
search.firstmatch = 1; |
Line 371 main(int argc, char *argv[]) |
|
Line 359 main(int argc, char *argv[]) |
|
/* Access the mandoc database. */ |
/* Access the mandoc database. */ |
|
|
manconf_parse(&conf, conf_file, defpaths, auxpaths); |
manconf_parse(&conf, conf_file, defpaths, auxpaths); |
#if HAVE_SQLITE3 |
|
mansearch_setup(1); |
|
if ( ! mansearch(&search, &conf.manpath, |
if ( ! mansearch(&search, &conf.manpath, |
argc, argv, &res, &sz)) |
argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
#else |
|
if (search.argmode != ARG_NAME) { |
|
fputs("mandoc: database support not compiled in\n", |
|
stderr); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
|
sz = 0; |
|
#endif |
|
|
|
if (sz == 0) { |
if (sz == 0) { |
if (search.argmode == ARG_NAME) |
if (search.argmode == ARG_NAME) |
Line 486 main(int argc, char *argv[]) |
|
Line 464 main(int argc, char *argv[]) |
|
|
|
if (resp == NULL) |
if (resp == NULL) |
parse(&curp, fd, *argv); |
parse(&curp, fd, *argv); |
else if (resp->form & FORM_SRC) { |
else if (resp->form == FORM_SRC) { |
/* For .so only; ignore failure. */ |
/* For .so only; ignore failure. */ |
chdir(conf.manpath.paths[resp->ipath]); |
chdir(conf.manpath.paths[resp->ipath]); |
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
Line 537 main(int argc, char *argv[]) |
|
Line 515 main(int argc, char *argv[]) |
|
out: |
out: |
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
manconf_free(&conf); |
manconf_free(&conf); |
#if HAVE_SQLITE3 |
|
mansearch_free(res, sz); |
mansearch_free(res, sz); |
mansearch_setup(0); |
|
#endif |
|
} |
} |
|
|
free(defos); |
free(defos); |
Line 644 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 619 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
glob_t globinfo; |
glob_t globinfo; |
struct manpage *page; |
struct manpage *page; |
char *file; |
char *file; |
int form, globres; |
int globres; |
|
enum form form; |
|
|
form = FORM_SRC; |
form = FORM_SRC; |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
Line 682 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 658 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
return 0; |
return 0; |
|
|
found: |
found: |
#if HAVE_SQLITE3 |
|
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
#endif |
|
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
page = *res + (*ressz - 1); |
page = *res + (*ressz - 1); |
page->file = file; |
page->file = file; |
Line 768 parse(struct curparse *curp, int fd, const char *file) |
|
Line 742 parse(struct curparse *curp, int fd, const char *file) |
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
mdoc_validate(man); |
mdoc_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_mdoc(curp->outdata, man); |
html_mdoc(curp->outdata, man); |
Line 792 parse(struct curparse *curp, int fd, const char *file) |
|
Line 765 parse(struct curparse *curp, int fd, const char *file) |
|
} |
} |
} |
} |
if (man->macroset == MACROSET_MAN) { |
if (man->macroset == MACROSET_MAN) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
man_validate(man); |
man_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_man(curp->outdata, man); |
html_man(curp->outdata, man); |