mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.294 and 1.304

version 1.294, 2017/07/01 09:47:30

version 1.304, 2018/04/13 19:55:30

Line 1

/* $Id$ */

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

Line 19

#include "config.h"

#include <sys/types.h>

#include <sys/ioctl.h>

#include <sys/param.h> /* MACHINE */

#include <sys/termios.h>

#include <sys/wait.h>

#include <assert.h>

Line 92 static int fs_lookup(const struct manpaths *,

Line 94 static int fs_lookup(const struct manpaths *,

size_t ipath, const char *,

const char *, const char *,

struct manpage **, size_t *);

static void fs_search(const struct mansearch *,

static int fs_search(const struct mansearch *,

const struct manpaths *, int, char**,

struct manpage **, size_t *);

static int koptions(int *, char *);

Line 111 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2

Line 113 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2

static char help_arg[] = "help";

static char *help_argv[] = {help_arg, NULL};

static enum mandoclevel rc;

static FILE *mmsg_stream;

int

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

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

struct manconf conf;

struct mansearch search;

struct curparse curp;

struct winsize ws;

struct tag_files *tag_files;

struct manpage *res, *resp;

const char *progname, *sec, *thisarg;

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

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

curp.mmin = MANDOCERR_MAX;

curp.outopts = &conf.output;

options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;

mmsg_stream = stderr;

use_pager = 1;

tag_files = NULL;

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

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

!isatty(STDOUT_FILENO))

use_pager = 0;

if (use_pager &&

(conf.output.width == 0 || conf.output.indent == 0) &&

ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) {

if (conf.output.width == 0 && ws.ws_col < 79)

conf.output.width = ws.ws_col - 1;

if (conf.output.indent == 0 && ws.ws_col < 66)

conf.output.indent = 3;

}

#if HAVE_PLEDGE

if (!use_pager)

if (pledge("stdio rpath", NULL) == -1)

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

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

parse(&curp, fd, *argv);

else if (resp->form == FORM_SRC) {

/* For .so only; ignore failure. */

chdir(conf.manpath.paths[resp->ipath]);

(void)chdir(conf.manpath.paths[resp->ipath]);

parse(&curp, fd, resp->file);

} else

passthrough(resp->file, fd,

conf.output.synopsisonly);

if (ferror(stdout)) {

if (tag_files != NULL) {

warn("%s", tag_files->ofn);

tag_unlink();

tag_files = NULL;

} else

warn("stdout");

rc = MANDOCLEVEL_SYSERR;

break;

}

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

if (curp.outdata == NULL)

outdata_alloc(&curp);

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

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

if (globres == 0)

file = mandoc_strdup(*globinfo.gl_pathv);

globfree(&globinfo);

if (globres != 0)

if (globres == 0)

goto found;

if (res != NULL || ipath + 1 != paths->sz)

return 0;

mandoc_asprintf(&file, "%s.%s", name, sec);

globres = access(file, R_OK);

free(file);

return globres != -1;

found:

warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",

name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);

if (res == NULL) {

free(file);

return 1;

}

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

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

page->file = file;

Line 681 found:

Line 717 found:

return 1;

}

static void

static int

fs_search(const struct mansearch *cfg, const struct manpaths *paths,

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

{

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

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

assert(cfg->argmode == ARG_NAME);

*res = NULL;

if (res != NULL)

*res = NULL;

*ressz = lastsz = 0;

while (argc) {

for (ipath = 0; ipath < paths->sz; ipath++) {

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

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

if (fs_lookup(paths, ipath, cfg->sec,

cfg->arch, *argv, res, ressz) &&

cfg->firstmatch)

return;

return 1;

} else for (isec = 0; isec < nsec; isec++)

if (fs_lookup(paths, ipath, sections[isec],

cfg->arch, *argv, res, ressz) &&

cfg->firstmatch)

return;

return 1;

}

if (*ressz == lastsz)

if (res != NULL && *ressz == lastsz)

warnx("No entry for %s in the manual.", *argv);

lastsz = *ressz;

argv++;

argc--;

}

return 0;

}

static void

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

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

if (man == NULL)

return;

if (curp->mmin < MANDOCERR_STYLE)

mandoc_xr_reset();

if (man->macroset == MACROSET_MDOC) {

if (curp->outtype != OUTT_TREE || !curp->outopts->noval)

mdoc_validate(man);

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

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

break;

}

check_xr(file);

if (curp->mmin < MANDOCERR_STYLE)

check_xr(file);

mparse_updaterc(curp->mp, &rc);

}

Line 820 check_xr(const char *file)

Line 858 check_xr(const char *file)

manpath_base(&paths);

for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {

if (xr->line == -1)

continue;

search.arch = NULL;

search.sec = xr->sec;

search.outkey = NULL;

Line 827 check_xr(const char *file)

Line 867 check_xr(const char *file)

search.firstmatch = 1;

if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))

continue;

mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);

if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))

continue;

if (xr->count == 1)

mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);

else

mandoc_asprintf(&cp, "Xr %s %s (%d times)",

xr->name, xr->sec, xr->count);

mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE,

file, xr->line, xr->pos + 1, cp);

free(cp);

Line 973 toptions(struct curparse *curp, char *arg)

Line 1019 toptions(struct curparse *curp, char *arg)

else if (0 == strcmp(arg, "lint")) {

curp->outtype = OUTT_LINT;

curp->mmin = MANDOCERR_BASE;

mmsg_stream = stdout;

} else if (0 == strcmp(arg, "tree"))

curp->outtype = OUTT_TREE;

else if (0 == strcmp(arg, "man"))

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

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

{

const char *mparse_msg;

fprintf(stderr, "%s: %s:", getprogname(),

fprintf(mmsg_stream, "%s: %s:", getprogname(),

file == NULL ? "<stdin>" : file);

if (line)

fprintf(stderr, "%d:%d:", line, col + 1);

fprintf(mmsg_stream, "%d:%d:", line, col + 1);

fprintf(stderr, " %s",

fprintf(mmsg_stream, " %s", mparse_strlevel(lvl));

t < MANDOCERR_STYLE ? "BASE" : mparse_strlevel(lvl));

if ((mparse_msg = mparse_strerror(t)) != NULL)

fprintf(stderr, ": %s", mparse_msg);

fprintf(mmsg_stream, ": %s", mparse_msg);

if (msg)

fprintf(stderr, ": %s", msg);

fprintf(mmsg_stream, ": %s", msg);

fputc('\n', stderr);

fputc('\n', mmsg_stream);

}

static pid_t

Line 1150 spawn_pager(struct tag_files *tag_files)

Line 1196 spawn_pager(struct tag_files *tag_files)

if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)

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

close(tag_files->ofd);

close(tag_files->tfd);

assert(tag_files->tfd == -1);

/* Do not start the pager before controlling the terminal. */

CVSweb