mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.260 and 1.266

version 1.260, 2015/12/15 17:38:45

version 1.266, 2016/05/18 22:36:00

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

Line 35

#include <stdint.h>

#include <stdlib.h>

#include <string.h>

#include <time.h>

#include <unistd.h>

#include "mandoc_aux.h"

Line 123 main(int argc, char *argv[])

Line 124 main(int argc, char *argv[])

unsigned char *uc;

struct manpage *res, *resp;

char *conf_file, *defpaths;

size_t isec, i, sz;

const char *sec;

size_t i, sz;

int prio, best_prio;

char sec;

enum mandoclevel rctmp;

enum outmode outmode;

int fd;

int show_usage;

Line 390 main(int argc, char *argv[])

if (outmode == OUTMODE_ONE) {

argc = 1;

best_prio = 10;

best_prio = 20;

} else if (outmode == OUTMODE_ALL)

argc = (int)sz;

Line 406 main(int argc, char *argv[])

res[i].output);

else if (outmode == OUTMODE_ONE) {

/* Search for the best section. */

isec = strcspn(res[i].file, "123456789");

sec = res[i].file;

sec = res[i].file[isec];

sec += strcspn(sec, "123456789");

if ('\0' == sec)

if (sec[0] == '\0')

continue;

prio = sec_prios[sec - '1'];

prio = sec_prios[sec[0] - '1'];

if (sec[1] != '/')

prio += 10;

if (prio >= best_prio)

continue;

best_prio = prio;

Line 459 main(int argc, char *argv[])

Line 461 main(int argc, char *argv[])

}

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 (use_pager) {

tag_files = tag_init();

Line 482 main(int argc, char *argv[])

Line 480 main(int argc, char *argv[])

if (argc > 1 && curp.outtype <= OUTT_UTF8)

ascii_sepline(curp.outdata);

}

} else if (rc < MANDOCLEVEL_ERROR)

rc = MANDOCLEVEL_ERROR;

if (MANDOCLEVEL_OK != rc && curp.wstop)

break;

Line 665 fs_lookup(const struct manpaths *paths, size_t ipath,

Line 664 fs_lookup(const struct manpaths *paths, size_t ipath,

found:

#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

*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));

page = *res + (*ressz - 1);

Line 685 fs_search(const struct mansearch *cfg, const struct ma

Line 684 fs_search(const struct mansearch *cfg, const struct ma

int argc, char **argv, struct manpage **res, size_t *ressz)

{

const char *const sections[] =

{"1", "8", "6", "2", "3", "3p", "5", "7", "4", "9"};

{"1", "8", "6", "2", "3", "5", "7", "4", "9", "3p"};

const size_t nsec = sizeof(sections)/sizeof(sections[0]);

size_t ipath, isec, lastsz;

Line 724 parse(struct curparse *curp, int fd, const char *file)

Line 723 parse(struct curparse *curp, int fd, const char *file)

/* Begin by parsing the file itself. */

assert(file);

assert(fd >= -1);

assert(fd >= 0);

rctmp = mparse_readfd(curp->mp, fd, file);

if (fd != STDIN_FILENO)

close(fd);

if (rc < rctmp)

rc = rctmp;

Line 1020 mmsg(enum mandocerr t, enum mandoclevel lvl,

Line 1021 mmsg(enum mandocerr t, enum mandoclevel lvl,

static pid_t

spawn_pager(struct tag_files *tag_files)

{

const struct timespec timeout = { 0, 100000000 }; /* 0.1s */

#define MAX_PAGER_ARGS 16

char *argv[MAX_PAGER_ARGS];

const char *pager;

Line 1069 spawn_pager(struct tag_files *tag_files)

Line 1071 spawn_pager(struct tag_files *tag_files)

case -1:

err((int)MANDOCLEVEL_SYSERR, "fork");

case 0:

/* Set pgrp in both parent and child to avoid racing exec. */

(void)setpgid(0, 0);

break;

default:

(void)setpgid(pager_pid, 0);

Line 1089 spawn_pager(struct tag_files *tag_files)

err((int)MANDOCLEVEL_SYSERR, "pager stdout");

close(tag_files->ofd);

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);

err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);

}

CVSweb