version 1.256, 2015/11/07 14:22:29 |
version 1.258, 2015/11/14 23:57:47 |
|
|
#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 131 main(int argc, char *argv[]) |
|
Line 132 main(int argc, char *argv[]) |
|
int show_usage; |
int show_usage; |
int options; |
int options; |
int use_pager; |
int use_pager; |
|
int status; |
int c; |
int c; |
|
pid_t pager_pid; |
|
|
#if HAVE_PROGNAME |
#if HAVE_PROGNAME |
progname = getprogname(); |
progname = getprogname(); |
Line 152 main(int argc, char *argv[]) |
|
Line 155 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 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 (pledge(use_pager ? "stdio rpath tmppath tty proc exec" : |
"stdio rpath", NULL) == -1) |
"stdio rpath", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
if (tag_files != NULL) { |
if (tag_files != NULL) { |
fclose(stdout); |
fclose(stdout); |
tag_write(); |
tag_write(); |
waitpid(spawn_pager(tag_files), NULL, 0); |
pager_pid = spawn_pager(tag_files); |
|
for (;;) { |
|
if (waitpid(pager_pid, &status, WUNTRACED) == -1) { |
|
if (errno == EINTR) |
|
continue; |
|
warn("wait"); |
|
rc = MANDOCLEVEL_SYSERR; |
|
break; |
|
} |
|
if (!WIFSTOPPED(status)) |
|
break; |
|
|
|
(void)tcsetpgrp(STDIN_FILENO, getpgid(0)); |
|
kill(0, WSTOPSIG(status)); |
|
|
|
/* |
|
* I'm now stopped. |
|
* When getting SIGCONT, continue here: |
|
*/ |
|
|
|
(void)tcsetpgrp(STDIN_FILENO, pager_pid); |
|
kill(pager_pid, SIGCONT); |
|
} |
tag_unlink(); |
tag_unlink(); |
} |
} |
|
|
Line 774 passthrough(const char *file, int fd, int synopsis_onl |
|
Line 799 passthrough(const char *file, int fd, int synopsis_onl |
|
|
|
FILE *stream; |
FILE *stream; |
const char *syscall; |
const char *syscall; |
char *line; |
char *line, *cp; |
size_t len, off; |
size_t linesz; |
ssize_t nw; |
|
int print; |
int print; |
|
|
fflush(stdout); |
line = NULL; |
|
linesz = 0; |
|
|
if ((stream = fdopen(fd, "r")) == NULL) { |
if ((stream = fdopen(fd, "r")) == NULL) { |
close(fd); |
close(fd); |
Line 788 passthrough(const char *file, int fd, int synopsis_onl |
|
Line 813 passthrough(const char *file, int fd, int synopsis_onl |
|
} |
} |
|
|
print = 0; |
print = 0; |
while ((line = fgetln(stream, &len)) != NULL) { |
while (getline(&line, &linesz, stream) != -1) { |
|
cp = line; |
if (synopsis_only) { |
if (synopsis_only) { |
if (print) { |
if (print) { |
if ( ! isspace((unsigned char)*line)) |
if ( ! isspace((unsigned char)*cp)) |
goto done; |
goto done; |
while (len && |
while (isspace((unsigned char)*cp)) |
isspace((unsigned char)*line)) { |
cp++; |
line++; |
|
len--; |
|
} |
|
} else { |
} else { |
if ((len == sizeof(synb) && |
if (strcmp(cp, synb) == 0 || |
! strncmp(line, synb, len - 1)) || |
strcmp(cp, synr) == 0) |
(len == sizeof(synr) && |
|
! strncmp(line, synr, len - 1))) |
|
print = 1; |
print = 1; |
continue; |
continue; |
} |
} |
} |
} |
for (off = 0; off < len; off += nw) |
if (fputs(cp, stdout)) { |
if ((nw = write(STDOUT_FILENO, line + off, |
fclose(stream); |
len - off)) == -1 || nw == 0) { |
syscall = "fputs"; |
fclose(stream); |
goto fail; |
syscall = "write"; |
} |
goto fail; |
|
} |
|
} |
} |
|
|
if (ferror(stream)) { |
if (ferror(stream)) { |
fclose(stream); |
fclose(stream); |
syscall = "fgetln"; |
syscall = "getline"; |
goto fail; |
goto fail; |
} |
} |
|
|
done: |
done: |
|
free(line); |
fclose(stream); |
fclose(stream); |
return; |
return; |
|
|
fail: |
fail: |
|
free(line); |
warn("%s: SYSERR: %s", file, syscall); |
warn("%s: SYSERR: %s", file, syscall); |
if (rc < MANDOCLEVEL_SYSERR) |
if (rc < MANDOCLEVEL_SYSERR) |
rc = MANDOCLEVEL_SYSERR; |
rc = MANDOCLEVEL_SYSERR; |
Line 1020 spawn_pager(struct tag_files *tag_files) |
|
Line 1041 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); |
|
if (tcsetpgrp(STDIN_FILENO, pager_pid) == -1) |
|
err((int)MANDOCLEVEL_SYSERR, "tcsetpgrp"); |
#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 |
return pager_pid; |
return pager_pid; |