version 1.295, 2017/07/01 12:02:31 |
version 1.306, 2018/05/14 14:10:23 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
|
|
#include "config.h" |
#include "config.h" |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
#include <sys/ioctl.h> |
#include <sys/param.h> /* MACHINE */ |
#include <sys/param.h> /* MACHINE */ |
|
#include <sys/termios.h> |
#include <sys/wait.h> |
#include <sys/wait.h> |
|
|
#include <assert.h> |
#include <assert.h> |
Line 111 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
Line 113 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
static char help_arg[] = "help"; |
static char help_arg[] = "help"; |
static char *help_argv[] = {help_arg, NULL}; |
static char *help_argv[] = {help_arg, NULL}; |
static enum mandoclevel rc; |
static enum mandoclevel rc; |
|
static FILE *mmsg_stream; |
|
|
|
|
int |
int |
Line 119 main(int argc, char *argv[]) |
|
Line 122 main(int argc, char *argv[]) |
|
struct manconf conf; |
struct manconf conf; |
struct mansearch search; |
struct mansearch search; |
struct curparse curp; |
struct curparse curp; |
|
struct winsize ws; |
struct tag_files *tag_files; |
struct tag_files *tag_files; |
struct manpage *res, *resp; |
struct manpage *res, *resp; |
const char *progname, *sec, *thisarg; |
const char *progname, *sec, *thisarg; |
Line 128 main(int argc, char *argv[]) |
|
Line 132 main(int argc, char *argv[]) |
|
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
int fd; |
int fd, startdir; |
int show_usage; |
int show_usage; |
int options; |
int options; |
int use_pager; |
int use_pager; |
Line 190 main(int argc, char *argv[]) |
|
Line 194 main(int argc, char *argv[]) |
|
curp.mmin = MANDOCERR_MAX; |
curp.mmin = MANDOCERR_MAX; |
curp.outopts = &conf.output; |
curp.outopts = &conf.output; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
|
mmsg_stream = stderr; |
|
|
use_pager = 1; |
use_pager = 1; |
tag_files = NULL; |
tag_files = NULL; |
Line 314 main(int argc, char *argv[]) |
|
Line 319 main(int argc, char *argv[]) |
|
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
use_pager = 0; |
use_pager = 0; |
|
|
|
if (use_pager && |
|
(conf.output.width == 0 || conf.output.indent == 0) && |
|
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && |
|
ws.ws_col > 1) { |
|
if (conf.output.width == 0 && ws.ws_col < 79) |
|
conf.output.width = ws.ws_col - 1; |
|
if (conf.output.indent == 0 && ws.ws_col < 66) |
|
conf.output.indent = 3; |
|
} |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (!use_pager) |
if (!use_pager) |
if (pledge("stdio rpath", NULL) == -1) |
if (pledge("stdio rpath", NULL) == -1) |
Line 372 main(int argc, char *argv[]) |
|
Line 387 main(int argc, char *argv[]) |
|
argc, argv, &res, &sz)) |
argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
|
|
if (sz == 0) { |
if (sz == 0 && search.argmode == ARG_NAME) |
if (search.argmode == ARG_NAME) |
fs_search(&search, &conf.manpath, |
fs_search(&search, &conf.manpath, |
argc, argv, &res, &sz); |
argc, argv, &res, &sz); |
|
else |
if (search.argmode == ARG_NAME) { |
warnx("nothing appropriate"); |
for (c = 0; c < argc; c++) { |
|
if (strchr(argv[c], '/') == NULL) |
|
continue; |
|
if (access(argv[c], R_OK) == -1) { |
|
warn("%s", argv[c]); |
|
continue; |
|
} |
|
res = mandoc_reallocarray(res, |
|
sz + 1, sizeof(*res)); |
|
res[sz].file = mandoc_strdup(argv[c]); |
|
res[sz].names = NULL; |
|
res[sz].output = NULL; |
|
res[sz].ipath = SIZE_MAX; |
|
res[sz].bits = 0; |
|
res[sz].sec = 10; |
|
res[sz].form = FORM_SRC; |
|
sz++; |
|
} |
} |
} |
|
|
if (sz == 0) { |
if (sz == 0) { |
|
if (search.argmode != ARG_NAME) |
|
warnx("nothing appropriate"); |
rc = MANDOCLEVEL_BADARG; |
rc = MANDOCLEVEL_BADARG; |
goto out; |
goto out; |
} |
} |
Line 464 main(int argc, char *argv[]) |
|
Line 498 main(int argc, char *argv[]) |
|
parse(&curp, STDIN_FILENO, "<stdin>"); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
} |
} |
|
|
|
/* |
|
* Remember the original working directory, if possible. |
|
* This will be needed if some names on the command line |
|
* are page names and some are relative file names. |
|
* Do not error out if the current directory is not |
|
* readable: Maybe it won't be needed after all. |
|
*/ |
|
startdir = open(".", O_RDONLY | O_DIRECTORY); |
|
|
while (argc > 0) { |
while (argc > 0) { |
|
|
|
/* |
|
* Changing directories is not needed in ARG_FILE mode. |
|
* Do it on a best-effort basis. Even in case of |
|
* failure, some functionality may still work. |
|
*/ |
|
if (resp != NULL) { |
|
if (resp->ipath != SIZE_MAX) |
|
(void)chdir(conf.manpath.paths[resp->ipath]); |
|
else if (startdir != -1) |
|
(void)fchdir(startdir); |
|
} |
|
|
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
if (fd != -1) { |
if (fd != -1) { |
if (use_pager) { |
if (use_pager) { |
Line 474 main(int argc, char *argv[]) |
|
Line 530 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. */ |
|
chdir(conf.manpath.paths[resp->ipath]); |
|
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
} else |
else |
passthrough(resp->file, fd, |
passthrough(resp->file, fd, |
conf.output.synopsisonly); |
conf.output.synopsisonly); |
|
|
|
if (ferror(stdout)) { |
|
if (tag_files != NULL) { |
|
warn("%s", tag_files->ofn); |
|
tag_unlink(); |
|
tag_files = NULL; |
|
} else |
|
warn("stdout"); |
|
rc = MANDOCLEVEL_SYSERR; |
|
break; |
|
} |
|
|
if (argc > 1 && curp.outtype <= OUTT_UTF8) { |
if (argc > 1 && curp.outtype <= OUTT_UTF8) { |
if (curp.outdata == NULL) |
if (curp.outdata == NULL) |
outdata_alloc(&curp); |
outdata_alloc(&curp); |
Line 500 main(int argc, char *argv[]) |
|
Line 565 main(int argc, char *argv[]) |
|
if (--argc) |
if (--argc) |
mparse_reset(curp.mp); |
mparse_reset(curp.mp); |
} |
} |
|
if (startdir != -1) { |
|
(void)fchdir(startdir); |
|
close(startdir); |
|
} |
|
|
if (curp.outdata != NULL) { |
if (curp.outdata != NULL) { |
switch (curp.outtype) { |
switch (curp.outtype) { |
Line 663 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 732 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
if (globres == 0) |
if (globres == 0) |
file = mandoc_strdup(*globinfo.gl_pathv); |
file = mandoc_strdup(*globinfo.gl_pathv); |
globfree(&globinfo); |
globfree(&globinfo); |
if (globres != 0) |
if (globres == 0) |
|
goto found; |
|
if (res != NULL || ipath + 1 != paths->sz) |
return 0; |
return 0; |
|
|
|
mandoc_asprintf(&file, "%s.%s", name, sec); |
|
globres = access(file, R_OK); |
|
free(file); |
|
return globres != -1; |
|
|
found: |
found: |
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]); |
if (res == NULL) |
if (res == NULL) { |
|
free(file); |
return 1; |
return 1; |
|
} |
*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 711 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 789 fs_search(const struct mansearch *cfg, const struct ma |
|
cfg->firstmatch) |
cfg->firstmatch) |
return 1; |
return 1; |
} |
} |
if (res != NULL && *ressz == lastsz) |
if (res != NULL && *ressz == lastsz && |
|
strchr(*argv, '/') == NULL) |
warnx("No entry for %s in the manual.", *argv); |
warnx("No entry for %s in the manual.", *argv); |
lastsz = *ressz; |
lastsz = *ressz; |
argv++; |
argv++; |
Line 754 parse(struct curparse *curp, int fd, const char *file) |
|
Line 833 parse(struct curparse *curp, int fd, const char *file) |
|
|
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
if (curp->mmin < MANDOCERR_STYLE) |
mandoc_xr_reset(); |
mandoc_xr_reset(); |
|
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
mdoc_validate(man); |
mdoc_validate(man); |
Line 807 parse(struct curparse *curp, int fd, const char *file) |
|
Line 885 parse(struct curparse *curp, int fd, const char *file) |
|
break; |
break; |
} |
} |
} |
} |
check_xr(file); |
if (curp->mmin < MANDOCERR_STYLE) |
|
check_xr(file); |
mparse_updaterc(curp->mp, &rc); |
mparse_updaterc(curp->mp, &rc); |
} |
} |
|
|
Line 824 check_xr(const char *file) |
|
Line 903 check_xr(const char *file) |
|
manpath_base(&paths); |
manpath_base(&paths); |
|
|
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
|
if (xr->line == -1) |
|
continue; |
search.arch = NULL; |
search.arch = NULL; |
search.sec = xr->sec; |
search.sec = xr->sec; |
search.outkey = NULL; |
search.outkey = NULL; |
Line 833 check_xr(const char *file) |
|
Line 914 check_xr(const char *file) |
|
continue; |
continue; |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
continue; |
continue; |
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
if (xr->count == 1) |
|
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
|
else |
|
mandoc_asprintf(&cp, "Xr %s %s (%d times)", |
|
xr->name, xr->sec, xr->count); |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
file, xr->line, xr->pos + 1, cp); |
file, xr->line, xr->pos + 1, cp); |
free(cp); |
free(cp); |
Line 979 toptions(struct curparse *curp, char *arg) |
|
Line 1064 toptions(struct curparse *curp, char *arg) |
|
else if (0 == strcmp(arg, "lint")) { |
else if (0 == strcmp(arg, "lint")) { |
curp->outtype = OUTT_LINT; |
curp->outtype = OUTT_LINT; |
curp->mmin = MANDOCERR_BASE; |
curp->mmin = MANDOCERR_BASE; |
|
mmsg_stream = stdout; |
} else if (0 == strcmp(arg, "tree")) |
} else if (0 == strcmp(arg, "tree")) |
curp->outtype = OUTT_TREE; |
curp->outtype = OUTT_TREE; |
else if (0 == strcmp(arg, "man")) |
else if (0 == strcmp(arg, "man")) |
Line 1068 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 1154 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
{ |
{ |
const char *mparse_msg; |
const char *mparse_msg; |
|
|
fprintf(stderr, "%s: %s:", getprogname(), |
fprintf(mmsg_stream, "%s: %s:", getprogname(), |
file == NULL ? "<stdin>" : file); |
file == NULL ? "<stdin>" : file); |
|
|
if (line) |
if (line) |
fprintf(stderr, "%d:%d:", line, col + 1); |
fprintf(mmsg_stream, "%d:%d:", line, col + 1); |
|
|
fprintf(stderr, " %s", |
fprintf(mmsg_stream, " %s", mparse_strlevel(lvl)); |
t < MANDOCERR_STYLE ? "BASE" : mparse_strlevel(lvl)); |
|
|
|
if ((mparse_msg = mparse_strerror(t)) != NULL) |
if ((mparse_msg = mparse_strerror(t)) != NULL) |
fprintf(stderr, ": %s", mparse_msg); |
fprintf(mmsg_stream, ": %s", mparse_msg); |
|
|
if (msg) |
if (msg) |
fprintf(stderr, ": %s", msg); |
fprintf(mmsg_stream, ": %s", msg); |
|
|
fputc('\n', stderr); |
fputc('\n', mmsg_stream); |
} |
} |
|
|
static pid_t |
static pid_t |
Line 1156 spawn_pager(struct tag_files *tag_files) |
|
Line 1241 spawn_pager(struct tag_files *tag_files) |
|
if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) |
if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pager stdout"); |
err((int)MANDOCLEVEL_SYSERR, "pager stdout"); |
close(tag_files->ofd); |
close(tag_files->ofd); |
close(tag_files->tfd); |
assert(tag_files->tfd == -1); |
|
|
/* Do not start the pager before controlling the terminal. */ |
/* Do not start the pager before controlling the terminal. */ |
|
|