version 1.264, 2016/04/13 12:26:25 |
version 1.268, 2016/07/10 14:05:13 |
|
|
#include <stdint.h> |
#include <stdint.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
#include <time.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
Line 478 main(int argc, char *argv[]) |
|
Line 479 main(int argc, char *argv[]) |
|
conf.output.synopsisonly); |
conf.output.synopsisonly); |
|
|
if (argc > 1 && curp.outtype <= OUTT_UTF8) |
if (argc > 1 && curp.outtype <= OUTT_UTF8) |
ascii_sepline(curp.outdata); |
terminal_sepline(curp.outdata); |
} else if (rc < MANDOCLEVEL_ERROR) |
} else if (rc < MANDOCLEVEL_ERROR) |
rc = MANDOCLEVEL_ERROR; |
rc = MANDOCLEVEL_ERROR; |
|
|
Line 663 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 664 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
|
|
found: |
found: |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
warnx("outdated mandoc.db lacks %s(%s) entry, run makewhatis %s", |
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
name, sec, paths->paths[ipath]); |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
#endif |
#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); |
Line 1020 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 1021 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
static pid_t |
static pid_t |
spawn_pager(struct tag_files *tag_files) |
spawn_pager(struct tag_files *tag_files) |
{ |
{ |
|
const struct timespec timeout = { 0, 100000000 }; /* 0.1s */ |
#define MAX_PAGER_ARGS 16 |
#define MAX_PAGER_ARGS 16 |
char *argv[MAX_PAGER_ARGS]; |
char *argv[MAX_PAGER_ARGS]; |
const char *pager; |
const char *pager; |
Line 1053 spawn_pager(struct tag_files *tag_files) |
|
Line 1055 spawn_pager(struct tag_files *tag_files) |
|
break; |
break; |
} |
} |
|
|
/* For more(1) and less(1), use the tag file. */ |
/* For less(1), use the tag file. */ |
|
|
if ((cmdlen = strlen(argv[0])) >= 4) { |
if ((cmdlen = strlen(argv[0])) >= 4) { |
cp = argv[0] + cmdlen - 4; |
cp = argv[0] + cmdlen - 4; |
if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) { |
if (strcmp(cp, "less") == 0) { |
argv[argc++] = mandoc_strdup("-T"); |
argv[argc++] = mandoc_strdup("-T"); |
argv[argc++] = tag_files->tfn; |
argv[argc++] = tag_files->tfn; |
} |
} |
Line 1069 spawn_pager(struct tag_files *tag_files) |
|
Line 1071 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)setpgid(pager_pid, 0); |
Line 1089 spawn_pager(struct tag_files *tag_files) |
|
Line 1089 spawn_pager(struct tag_files *tag_files) |
|
err((int)MANDOCLEVEL_SYSERR, "pager stdout"); |
err((int)MANDOCLEVEL_SYSERR, "pager stdout"); |
close(tag_files->ofd); |
close(tag_files->ofd); |
close(tag_files->tfd); |
close(tag_files->tfd); |
|
|
|
/* Do not start the pager before controlling the terminal. */ |
|
|
|
while (tcgetpgrp(STDIN_FILENO) != getpid()) |
|
nanosleep(&timeout, NULL); |
|
|
execvp(argv[0], argv); |
execvp(argv[0], argv); |
err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]); |
err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]); |
} |
} |