version 1.272, 2016/07/15 19:33:01 |
version 1.287, 2017/03/27 18:51:36 |
|
|
/* $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-2016 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2012, 2014-2017 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 "manconf.h" |
#include "manconf.h" |
#include "mansearch.h" |
#include "mansearch.h" |
|
|
#if !defined(__GNUC__) || (__GNUC__ < 2) |
|
# if !defined(lint) |
|
# define __attribute__(x) |
|
# endif |
|
#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ |
|
|
|
enum outmode { |
enum outmode { |
OUTMODE_DEF = 0, |
OUTMODE_DEF = 0, |
OUTMODE_FLN, |
OUTMODE_FLN, |
|
|
OUTT_TREE, /* -Ttree */ |
OUTT_TREE, /* -Ttree */ |
OUTT_MAN, /* -Tman */ |
OUTT_MAN, /* -Tman */ |
OUTT_HTML, /* -Thtml */ |
OUTT_HTML, /* -Thtml */ |
|
OUTT_MARKDOWN, /* -Tmarkdown */ |
OUTT_LINT, /* -Tlint */ |
OUTT_LINT, /* -Tlint */ |
OUTT_PS, /* -Tps */ |
OUTT_PS, /* -Tps */ |
OUTT_PDF /* -Tpdf */ |
OUTT_PDF /* -Tpdf */ |
Line 88 struct curparse { |
|
Line 83 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 100 static void fs_search(const struct mansearch *, |
|
Line 93 static void fs_search(const struct mansearch *, |
|
const struct manpaths *, int, char**, |
const struct manpaths *, int, char**, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static int koptions(int *, char *); |
static int koptions(int *, char *); |
static int moptions(int *, char *); |
static void moptions(int *, char *); |
static void mmsg(enum mandocerr, enum mandoclevel, |
static void mmsg(enum mandocerr, enum mandoclevel, |
const char *, int, int, const char *); |
const char *, int, int, const char *); |
|
static void outdata_alloc(struct curparse *); |
static void parse(struct curparse *, int, const char *); |
static void parse(struct curparse *, int, const char *); |
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 curparse curp; |
|
struct mansearch search; |
struct mansearch search; |
|
struct curparse curp; |
struct tag_files *tag_files; |
struct tag_files *tag_files; |
const char *progname; |
|
char *auxpaths; |
|
char *defos; |
|
unsigned char *uc; |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
char *conf_file, *defpaths; |
const char *progname, *sec, *thisarg; |
const char *sec; |
char *conf_file, *defpaths, *auxpaths; |
|
char *defos, *oarg; |
|
unsigned char *uc; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
Line 153 main(int argc, char *argv[]) |
|
Line 145 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", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
Line 177 main(int argc, char *argv[]) |
|
Line 167 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 255 main(int argc, char *argv[]) |
|
Line 246 main(int argc, char *argv[]) |
|
auxpaths = optarg; |
auxpaths = optarg; |
break; |
break; |
case 'O': |
case 'O': |
search.outkey = optarg; |
oarg = optarg; |
while (optarg != NULL) |
|
manconf_output(&conf.output, |
|
strsep(&optarg, ",")); |
|
break; |
break; |
case 'S': |
case 'S': |
search.arch = optarg; |
search.arch = optarg; |
Line 303 main(int argc, char *argv[]) |
|
Line 291 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 310 main(int argc, char *argv[]) |
|
Line 313 main(int argc, char *argv[]) |
|
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (!use_pager) |
if (!use_pager) |
if (pledge("stdio rpath flock", NULL) == -1) |
if (pledge("stdio rpath", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
Line 355 main(int argc, char *argv[]) |
|
Line 358 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 365 main(int argc, char *argv[]) |
|
Line 365 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 452 main(int argc, char *argv[]) |
|
Line 442 main(int argc, char *argv[]) |
|
} |
} |
#endif |
#endif |
|
|
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
if (search.argmode == ARG_FILE) |
return (int)MANDOCLEVEL_BADARG; |
moptions(&options, auxpaths); |
|
|
mchars_alloc(); |
mchars_alloc(); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); |
Line 480 main(int argc, char *argv[]) |
|
Line 470 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 488 main(int argc, char *argv[]) |
|
Line 478 main(int argc, char *argv[]) |
|
passthrough(resp->file, fd, |
passthrough(resp->file, fd, |
conf.output.synopsisonly); |
conf.output.synopsisonly); |
|
|
if (argc > 1 && curp.outtype <= OUTT_UTF8) |
if (argc > 1 && curp.outtype <= OUTT_UTF8) { |
|
if (curp.outdata == NULL) |
|
outdata_alloc(&curp); |
terminal_sepline(curp.outdata); |
terminal_sepline(curp.outdata); |
|
} |
} else if (rc < MANDOCLEVEL_ERROR) |
} else if (rc < MANDOCLEVEL_ERROR) |
rc = MANDOCLEVEL_ERROR; |
rc = MANDOCLEVEL_ERROR; |
|
|
Line 528 main(int argc, char *argv[]) |
|
Line 521 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); |
|
|
|
|
/* Stop here until moved to the foreground. */ |
/* Stop here until moved to the foreground. */ |
|
|
tc_pgid = tcgetpgrp(STDIN_FILENO); |
tc_pgid = tcgetpgrp(tag_files->ofd); |
if (tc_pgid != man_pgid) { |
if (tc_pgid != man_pgid) { |
if (tc_pgid == pager_pid) { |
if (tc_pgid == pager_pid) { |
(void)tcsetpgrp(STDIN_FILENO, |
(void)tcsetpgrp(tag_files->ofd, |
man_pgid); |
man_pgid); |
if (signum == SIGTTIN) |
if (signum == SIGTTIN) |
continue; |
continue; |
|
|
/* Once in the foreground, activate the pager. */ |
/* Once in the foreground, activate the pager. */ |
|
|
if (pager_pid) { |
if (pager_pid) { |
(void)tcsetpgrp(STDIN_FILENO, pager_pid); |
(void)tcsetpgrp(tag_files->ofd, pager_pid); |
kill(pager_pid, SIGCONT); |
kill(pager_pid, SIGCONT); |
} else |
} else |
pager_pid = spawn_pager(tag_files); |
pager_pid = spawn_pager(tag_files); |
Line 602 usage(enum argmode argmode) |
|
Line 592 usage(enum argmode argmode) |
|
|
|
switch (argmode) { |
switch (argmode) { |
case ARG_FILE: |
case ARG_FILE: |
fputs("usage: mandoc [-acfhkl] [-I os=name] " |
fputs("usage: mandoc [-ac] [-I os=name] " |
"[-K encoding] [-mformat] [-O option]\n" |
"[-K encoding] [-mdoc | -man] [-O options]\n" |
"\t [-T output] [-W level] [file ...]\n", stderr); |
"\t [-T output] [-W level] [file ...]\n", stderr); |
break; |
break; |
case ARG_NAME: |
case ARG_NAME: |
fputs("usage: man [-acfhklw] [-C file] [-I os=name] " |
fputs("usage: man [-acfhklw] [-C file] [-M path] " |
"[-K encoding] [-M path] [-m path]\n" |
"[-m path] [-S subsection]\n" |
"\t [-O option=value] [-S subsection] [-s section] " |
"\t [[-s] section] name ...\n", stderr); |
"[-T output] [-W level]\n" |
|
"\t [section] name ...\n", stderr); |
|
break; |
break; |
case ARG_WORD: |
case ARG_WORD: |
fputs("usage: whatis [-acfhklw] [-C file] " |
fputs("usage: whatis [-afk] [-C file] " |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"\t [-s section] name ...\n", stderr); |
"\t [-s section] name ...\n", stderr); |
break; |
break; |
case ARG_EXPR: |
case ARG_EXPR: |
fputs("usage: apropos [-acfhklw] [-C file] " |
fputs("usage: apropos [-afk] [-C file] " |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"\t [-s section] expression ...\n", stderr); |
"\t [-s section] expression ...\n", stderr); |
break; |
break; |
Line 635 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 623 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 673 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 662 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 749 parse(struct curparse *curp, int fd, const char *file) |
|
Line 736 parse(struct curparse *curp, int fd, const char *file) |
|
if (rctmp != MANDOCLEVEL_OK && curp->wstop) |
if (rctmp != MANDOCLEVEL_OK && curp->wstop) |
return; |
return; |
|
|
/* If unset, allocate output dev now (if applicable). */ |
if (curp->outdata == NULL) |
|
outdata_alloc(curp); |
|
|
if (curp->outdata == NULL) { |
|
switch (curp->outtype) { |
|
case OUTT_HTML: |
|
curp->outdata = html_alloc(curp->outopts); |
|
break; |
|
case OUTT_UTF8: |
|
curp->outdata = utf8_alloc(curp->outopts); |
|
break; |
|
case OUTT_LOCALE: |
|
curp->outdata = locale_alloc(curp->outopts); |
|
break; |
|
case OUTT_ASCII: |
|
curp->outdata = ascii_alloc(curp->outopts); |
|
break; |
|
case OUTT_PDF: |
|
curp->outdata = pdf_alloc(curp->outopts); |
|
break; |
|
case OUTT_PS: |
|
curp->outdata = ps_alloc(curp->outopts); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
mparse_result(curp->mp, &man, NULL); |
mparse_result(curp->mp, &man, NULL); |
|
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
Line 783 parse(struct curparse *curp, int fd, const char *file) |
|
Line 746 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) { |
mdoc_validate(man); |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
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 801 parse(struct curparse *curp, int fd, const char *file) |
|
Line 765 parse(struct curparse *curp, int fd, const char *file) |
|
case OUTT_PS: |
case OUTT_PS: |
terminal_mdoc(curp->outdata, man); |
terminal_mdoc(curp->outdata, man); |
break; |
break; |
|
case OUTT_MARKDOWN: |
|
markdown_mdoc(curp->outdata, man); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (man->macroset == MACROSET_MAN) { |
if (man->macroset == MACROSET_MAN) { |
man_validate(man); |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
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); |
Line 828 parse(struct curparse *curp, int fd, const char *file) |
|
Line 796 parse(struct curparse *curp, int fd, const char *file) |
|
break; |
break; |
} |
} |
} |
} |
|
mparse_updaterc(curp->mp, &rc); |
} |
} |
|
|
static void |
static void |
|
outdata_alloc(struct curparse *curp) |
|
{ |
|
switch (curp->outtype) { |
|
case OUTT_HTML: |
|
curp->outdata = html_alloc(curp->outopts); |
|
break; |
|
case OUTT_UTF8: |
|
curp->outdata = utf8_alloc(curp->outopts); |
|
break; |
|
case OUTT_LOCALE: |
|
curp->outdata = locale_alloc(curp->outopts); |
|
break; |
|
case OUTT_ASCII: |
|
curp->outdata = ascii_alloc(curp->outopts); |
|
break; |
|
case OUTT_PDF: |
|
curp->outdata = pdf_alloc(curp->outopts); |
|
break; |
|
case OUTT_PS: |
|
curp->outdata = ps_alloc(curp->outopts); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static void |
passthrough(const char *file, int fd, int synopsis_only) |
passthrough(const char *file, int fd, int synopsis_only) |
{ |
{ |
const char synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS"; |
const char synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS"; |
Line 840 passthrough(const char *file, int fd, int synopsis_onl |
|
Line 836 passthrough(const char *file, int fd, int synopsis_onl |
|
const char *syscall; |
const char *syscall; |
char *line, *cp; |
char *line, *cp; |
size_t linesz; |
size_t linesz; |
|
ssize_t len, written; |
int print; |
int print; |
|
|
line = NULL; |
line = NULL; |
linesz = 0; |
linesz = 0; |
|
|
|
if (fflush(stdout) == EOF) { |
|
syscall = "fflush"; |
|
goto fail; |
|
} |
|
|
if ((stream = fdopen(fd, "r")) == NULL) { |
if ((stream = fdopen(fd, "r")) == NULL) { |
close(fd); |
close(fd); |
syscall = "fdopen"; |
syscall = "fdopen"; |
Line 852 passthrough(const char *file, int fd, int synopsis_onl |
|
Line 854 passthrough(const char *file, int fd, int synopsis_onl |
|
} |
} |
|
|
print = 0; |
print = 0; |
while (getline(&line, &linesz, stream) != -1) { |
while ((len = getline(&line, &linesz, stream)) != -1) { |
cp = line; |
cp = line; |
if (synopsis_only) { |
if (synopsis_only) { |
if (print) { |
if (print) { |
if ( ! isspace((unsigned char)*cp)) |
if ( ! isspace((unsigned char)*cp)) |
goto done; |
goto done; |
while (isspace((unsigned char)*cp)) |
while (isspace((unsigned char)*cp)) { |
cp++; |
cp++; |
|
len--; |
|
} |
} else { |
} else { |
if (strcmp(cp, synb) == 0 || |
if (strcmp(cp, synb) == 0 || |
strcmp(cp, synr) == 0) |
strcmp(cp, synr) == 0) |
Line 867 passthrough(const char *file, int fd, int synopsis_onl |
|
Line 871 passthrough(const char *file, int fd, int synopsis_onl |
|
continue; |
continue; |
} |
} |
} |
} |
if (fputs(cp, stdout)) { |
for (; len > 0; len -= written) { |
|
if ((written = write(STDOUT_FILENO, cp, len)) != -1) |
|
continue; |
fclose(stream); |
fclose(stream); |
syscall = "fputs"; |
syscall = "write"; |
goto fail; |
goto fail; |
} |
} |
} |
} |
Line 911 koptions(int *options, char *arg) |
|
Line 917 koptions(int *options, char *arg) |
|
return 1; |
return 1; |
} |
} |
|
|
static int |
static void |
moptions(int *options, char *arg) |
moptions(int *options, char *arg) |
{ |
{ |
|
|
if (arg == NULL) |
if (arg == NULL) |
/* nothing to do */; |
return; |
else if (0 == strcmp(arg, "doc")) |
if (strcmp(arg, "doc") == 0) |
*options |= MPARSE_MDOC; |
*options |= MPARSE_MDOC; |
else if (0 == strcmp(arg, "andoc")) |
else if (strcmp(arg, "an") == 0) |
/* nothing to do */; |
|
else if (0 == strcmp(arg, "an")) |
|
*options |= MPARSE_MAN; |
*options |= MPARSE_MAN; |
else { |
|
warnx("-m %s: Bad argument", arg); |
|
return 0; |
|
} |
|
|
|
return 1; |
|
} |
} |
|
|
static int |
static int |
Line 946 toptions(struct curparse *curp, char *arg) |
|
Line 944 toptions(struct curparse *curp, char *arg) |
|
curp->outtype = OUTT_MAN; |
curp->outtype = OUTT_MAN; |
else if (0 == strcmp(arg, "html")) |
else if (0 == strcmp(arg, "html")) |
curp->outtype = OUTT_HTML; |
curp->outtype = OUTT_HTML; |
|
else if (0 == strcmp(arg, "markdown")) |
|
curp->outtype = OUTT_MARKDOWN; |
else if (0 == strcmp(arg, "utf8")) |
else if (0 == strcmp(arg, "utf8")) |
curp->outtype = OUTT_UTF8; |
curp->outtype = OUTT_UTF8; |
else if (0 == strcmp(arg, "locale")) |
else if (0 == strcmp(arg, "locale")) |
Line 1012 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 1012 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
{ |
{ |
const char *mparse_msg; |
const char *mparse_msg; |
|
|
fprintf(stderr, "%s: %s:", getprogname(), file); |
fprintf(stderr, "%s: %s:", getprogname(), |
|
file == NULL ? "<stdin>" : file); |
|
|
if (line) |
if (line) |
fprintf(stderr, "%d:%d:", line, col + 1); |
fprintf(stderr, "%d:%d:", line, col + 1); |
Line 1084 spawn_pager(struct tag_files *tag_files) |
|
Line 1085 spawn_pager(struct tag_files *tag_files) |
|
break; |
break; |
default: |
default: |
(void)setpgid(pager_pid, 0); |
(void)setpgid(pager_pid, 0); |
(void)tcsetpgrp(STDIN_FILENO, pager_pid); |
(void)tcsetpgrp(tag_files->ofd, pager_pid); |
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge("stdio rpath tmppath tty proc", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
Line 1102 spawn_pager(struct tag_files *tag_files) |
|
Line 1103 spawn_pager(struct tag_files *tag_files) |
|
|
|
/* Do not start the pager before controlling the terminal. */ |
/* Do not start the pager before controlling the terminal. */ |
|
|
while (tcgetpgrp(STDIN_FILENO) != getpid()) |
while (tcgetpgrp(STDOUT_FILENO) != getpid()) |
nanosleep(&timeout, NULL); |
nanosleep(&timeout, NULL); |
|
|
execvp(argv[0], argv); |
execvp(argv[0], argv); |