version 1.257, 2015/11/07 17:58:55 |
version 1.262, 2016/01/08 02:53:13 |
|
|
/* $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, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2012, 2014-2016 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 |
|
|
#if HAVE_ERR |
#if HAVE_ERR |
#include <err.h> |
#include <err.h> |
#endif |
#endif |
|
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#include <glob.h> |
#include <glob.h> |
#include <signal.h> |
#include <signal.h> |
Line 125 main(int argc, char *argv[]) |
|
Line 126 main(int argc, char *argv[]) |
|
size_t isec, i, sz; |
size_t isec, i, sz; |
int prio, best_prio; |
int prio, best_prio; |
char sec; |
char sec; |
enum mandoclevel rctmp; |
|
enum outmode outmode; |
enum outmode outmode; |
int fd; |
int fd; |
int show_usage; |
int show_usage; |
int options; |
int options; |
int use_pager; |
int use_pager; |
|
int status, signum; |
int c; |
int c; |
|
pid_t pager_pid, tc_pgid, man_pgid, pid; |
|
|
#if HAVE_PROGNAME |
#if HAVE_PROGNAME |
progname = getprogname(); |
progname = getprogname(); |
Line 152 main(int argc, char *argv[]) |
|
Line 154 main(int argc, char *argv[]) |
|
#endif |
#endif |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge("stdio rpath tmppath proc exec flock", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
Line 296 main(int argc, char *argv[]) |
|
Line 298 main(int argc, char *argv[]) |
|
use_pager = 0; |
use_pager = 0; |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (!use_pager && pledge("stdio rpath flock", NULL) == -1) |
if (!use_pager) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
if (pledge("stdio rpath flock", NULL) == -1) |
|
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
/* Parse arguments. */ |
/* Parse arguments. */ |
Line 427 main(int argc, char *argv[]) |
|
Line 430 main(int argc, char *argv[]) |
|
/* mandoc(1) */ |
/* mandoc(1) */ |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge(use_pager ? "stdio rpath tmppath proc exec" : |
if (use_pager) { |
"stdio rpath", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
|
} else { |
|
if (pledge("stdio rpath", NULL) == -1) |
|
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
|
} |
#endif |
#endif |
|
|
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
Line 451 main(int argc, char *argv[]) |
|
Line 458 main(int argc, char *argv[]) |
|
} |
} |
|
|
while (argc > 0) { |
while (argc > 0) { |
rctmp = mparse_open(curp.mp, &fd, |
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
resp != NULL ? resp->file : *argv); |
|
if (rc < rctmp) |
|
rc = rctmp; |
|
|
|
if (fd != -1) { |
if (fd != -1) { |
if (use_pager) { |
if (use_pager) { |
tag_files = tag_init(); |
tag_files = tag_init(); |
Line 474 main(int argc, char *argv[]) |
|
Line 477 main(int argc, char *argv[]) |
|
|
|
if (argc > 1 && curp.outtype <= OUTT_UTF8) |
if (argc > 1 && curp.outtype <= OUTT_UTF8) |
ascii_sepline(curp.outdata); |
ascii_sepline(curp.outdata); |
} |
} else if (rc < MANDOCLEVEL_ERROR) |
|
rc = MANDOCLEVEL_ERROR; |
|
|
if (MANDOCLEVEL_OK != rc && curp.wstop) |
if (MANDOCLEVEL_OK != rc && curp.wstop) |
break; |
break; |
|
|
if (tag_files != NULL) { |
if (tag_files != NULL) { |
fclose(stdout); |
fclose(stdout); |
tag_write(); |
tag_write(); |
waitpid(spawn_pager(tag_files), NULL, 0); |
man_pgid = getpgid(0); |
|
tag_files->tcpgid = man_pgid == getpid() ? |
|
getpgid(getppid()) : man_pgid; |
|
pager_pid = 0; |
|
signum = SIGSTOP; |
|
for (;;) { |
|
|
|
/* Stop here until moved to the foreground. */ |
|
|
|
tc_pgid = tcgetpgrp(STDIN_FILENO); |
|
if (tc_pgid != man_pgid) { |
|
if (tc_pgid == pager_pid) { |
|
(void)tcsetpgrp(STDIN_FILENO, |
|
man_pgid); |
|
if (signum == SIGTTIN) |
|
continue; |
|
} else |
|
tag_files->tcpgid = tc_pgid; |
|
kill(0, signum); |
|
continue; |
|
} |
|
|
|
/* Once in the foreground, activate the pager. */ |
|
|
|
if (pager_pid) { |
|
(void)tcsetpgrp(STDIN_FILENO, pager_pid); |
|
kill(pager_pid, SIGCONT); |
|
} else |
|
pager_pid = spawn_pager(tag_files); |
|
|
|
/* Wait for the pager to stop or exit. */ |
|
|
|
while ((pid = waitpid(pager_pid, &status, |
|
WUNTRACED)) == -1 && errno == EINTR) |
|
continue; |
|
|
|
if (pid == -1) { |
|
warn("wait"); |
|
rc = MANDOCLEVEL_SYSERR; |
|
break; |
|
} |
|
if (!WIFSTOPPED(status)) |
|
break; |
|
|
|
signum = WSTOPSIG(status); |
|
} |
tag_unlink(); |
tag_unlink(); |
} |
} |
|
|
Line 671 parse(struct curparse *curp, int fd, const char *file) |
|
Line 720 parse(struct curparse *curp, int fd, const char *file) |
|
/* Begin by parsing the file itself. */ |
/* Begin by parsing the file itself. */ |
|
|
assert(file); |
assert(file); |
assert(fd >= -1); |
assert(fd > 0); |
|
|
rctmp = mparse_readfd(curp->mp, fd, file); |
rctmp = mparse_readfd(curp->mp, fd, file); |
|
if (fd != STDIN_FILENO) |
|
close(fd); |
if (rc < rctmp) |
if (rc < rctmp) |
rc = rctmp; |
rc = rctmp; |
|
|
Line 1016 spawn_pager(struct tag_files *tag_files) |
|
Line 1067 spawn_pager(struct tag_files *tag_files) |
|
case -1: |
case -1: |
err((int)MANDOCLEVEL_SYSERR, "fork"); |
err((int)MANDOCLEVEL_SYSERR, "fork"); |
case 0: |
case 0: |
|
/* Set pgrp in both parent and child to avoid racing exec. */ |
|
(void)setpgid(0, 0); |
break; |
break; |
default: |
default: |
|
(void)setpgid(pager_pid, 0); |
|
(void)tcsetpgrp(STDIN_FILENO, pager_pid); |
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge("stdio rpath tmppath", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
tag_files->pager_pid = pager_pid; |
return pager_pid; |
return pager_pid; |
} |
} |
|
|