mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

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

version 1.286, 2017/03/20 14:32:24

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

Line 43

#include "mandoc_aux.h"

#include "mandoc.h"

#include "mandoc_xr.h"

#include "roff.h"

#include "mdoc.h"

#include "man.h"

Line 56 enum outmode {

Line 57 enum outmode {

OUTMODE_FLN,

OUTMODE_LST,

OUTMODE_ALL,

OUTMODE_INT,

OUTMODE_ONE

};

Line 75 enum outt {

struct curparse {

struct mparse *mp;

enum mandoclevel wlevel; /* ignore messages below this */

struct manoutput *outopts; /* output options */

void *outdata; /* data for output */

char *os_s; /* operating system for display */

int wstop; /* stop after a file with a warning */

enum mandocerr mmin; /* ignore messages below this */

enum mandoc_os os_e; /* check base system conventions */

enum outt outtype; /* which output to use */

void *outdata; /* data for output */

struct manoutput *outopts; /* output options */

};

int mandocdb(int, char *[]);

static void check_xr(const char *);

static int fs_lookup(const struct manpaths *,

size_t ipath, const char *,

const char *, const char *,

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

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

struct manpage *res, *resp;

const char *progname, *sec, *thisarg;

char *conf_file, *defpaths, *auxpaths;

char *defos, *oarg;

char *oarg;

unsigned char *uc;

size_t i, sz;

int prio, best_prio;

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

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

memset(&curp, 0, sizeof(struct curparse));

curp.outtype = OUTT_LOCALE;

curp.wlevel = MANDOCLEVEL_BADARG;

curp.mmin = MANDOCERR_MAX;

curp.outopts = &conf.output;

options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;

defos = NULL;

use_pager = 1;

tag_files = NULL;

show_usage = 0;

outmode = OUTMODE_DEF;

while (-1 != (c = getopt(argc, argv,

while ((c = getopt(argc, argv,

"aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {

"aC:cfhI:iK:klM:m:O:S:s:T:VW:w")) != -1) {

if (c == 'i' && search.argmode == ARG_EXPR) {

optind--;

break;

}

switch (c) {

case 'a':

outmode = OUTMODE_ALL;

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

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

warnx("-I %s: Bad argument", optarg);

return (int)MANDOCLEVEL_BADARG;

}

if (defos) {

if (curp.os_s != NULL) {

warnx("-I %s: Duplicate argument", optarg);

return (int)MANDOCLEVEL_BADARG;

}

defos = mandoc_strdup(optarg + 3);

curp.os_s = mandoc_strdup(optarg + 3);

break;

case 'i':

outmode = OUTMODE_INT;

break;

case 'K':

if ( ! koptions(&options, optarg))

return (int)MANDOCLEVEL_BADARG;

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

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

moptions(&options, auxpaths);

mchars_alloc();

curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);

curp.mp = mparse_alloc(options, curp.mmin, mmsg,

curp.os_e, curp.os_s);

* Conditionally start up the lookaside buffer before parsing.

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

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

break;

}

mandoc_xr_free();

mparse_free(curp.mp);

mchars_free();

Line 524 out:

Line 529 out:

mansearch_free(res, sz);

}

free(defos);

free(curp.os_s);

* When using a pager, finish writing both temporary files,

Line 592 usage(enum argmode argmode)

Line 597 usage(enum argmode argmode)

switch (argmode) {

case ARG_FILE:

fputs("usage: mandoc [-acfhkl] [-I os=name] "

fputs("usage: mandoc [-ac] [-I os=name] "

"[-K encoding] [-mformat] [-O option]\n"

"[-K encoding] [-mdoc | -man] [-O options]\n"

"\t [-T output] [-W level] [file ...]\n", stderr);

break;

case ARG_NAME:

fputs("usage: man [-acfhklw] [-C file] [-I os=name] "

fputs("usage: man [-acfhklw] [-C file] [-M path] "

"[-K encoding] [-M path] [-m path]\n"

"[-m path] [-S subsection]\n"

"\t [-O option=value] [-S subsection] [-s section] "

"\t [[-s] section] name ...\n", stderr);

"[-T output] [-W level]\n"

"\t [section] name ...\n", stderr);

break;

case ARG_WORD:

fputs("usage: whatis [-acfhklw] [-C file] "

fputs("usage: whatis [-afk] [-C file] "

"[-M path] [-m path] [-O outkey] [-S arch]\n"

"\t [-s section] name ...\n", stderr);

break;

case ARG_EXPR:

fputs("usage: apropos [-acfhklw] [-C file] "

fputs("usage: apropos [-afk] [-C file] "

"[-M path] [-m path] [-O outkey] [-S arch]\n"

"\t [-s section] expression ...\n", stderr);

break;

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

Line 750 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 798 parse(struct curparse *curp, int fd, const char *file)

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

break;

}

check_xr(file);

mparse_updaterc(curp->mp, &rc);

}

static void

check_xr(const char *file)

{

static struct manpaths paths;

struct mansearch search;

struct mandoc_xr *xr;

char *cp;

size_t sz;

if (paths.sz == 0)

manpath_base(&paths);

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

search.arch = NULL;

search.sec = xr->sec;

search.outkey = NULL;

search.argmode = ARG_NAME;

search.firstmatch = 1;

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

continue;

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

mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE,

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

free(cp);

}

static void

outdata_alloc(struct curparse *curp)

{

switch (curp->outtype) {

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

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

curp->outtype = OUTT_ASCII;

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

curp->outtype = OUTT_LINT;

curp->wlevel = MANDOCLEVEL_WARNING;

curp->mmin = MANDOCERR_BASE;

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

curp->outtype = OUTT_TREE;

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

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

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

curp->outtype = OUTT_UTF8;

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

curp->outtype = OUTT_LOCALE;

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

curp->outtype = OUTT_HTML;

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

curp->outtype = OUTT_PS;

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

Line 970 static int

Line 1001 static int

woptions(struct curparse *curp, char *arg)

{

char *v, *o;

const char *toks[7];

const char *toks[11];

toks[0] = "stop";

toks[1] = "all";

toks[2] = "warning";

toks[2] = "base";

toks[3] = "error";

toks[3] = "style";

toks[4] = "unsupp";

toks[4] = "warning";

toks[5] = "fatal";

toks[5] = "error";

toks[6] = NULL;

toks[6] = "unsupp";

toks[7] = "fatal";

toks[8] = "openbsd";

toks[9] = "netbsd";

toks[10] = NULL;

while (*arg) {

o = arg;

Line 988 woptions(struct curparse *curp, char *arg)

Line 1023 woptions(struct curparse *curp, char *arg)

break;

case 1:

case 2:

curp->wlevel = MANDOCLEVEL_WARNING;

curp->mmin = MANDOCERR_BASE;

break;

case 3:

curp->wlevel = MANDOCLEVEL_ERROR;

curp->mmin = MANDOCERR_STYLE;

break;

case 4:

curp->wlevel = MANDOCLEVEL_UNSUPP;

curp->mmin = MANDOCERR_WARNING;

break;

case 5:

curp->wlevel = MANDOCLEVEL_BADARG;

curp->mmin = MANDOCERR_ERROR;

break;

case 6:

curp->mmin = MANDOCERR_UNSUPP;

break;

case 7:

curp->mmin = MANDOCERR_MAX;

break;

case 8:

curp->mmin = MANDOCERR_BASE;

curp->os_e = MANDOC_OS_OPENBSD;

break;

case 9:

curp->mmin = MANDOCERR_BASE;

curp->os_e = MANDOC_OS_NETBSD;

break;

default:

warnx("-W %s: Bad argument", o);

return 0;

}

return 1;

}

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

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

if (line)

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

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

fprintf(stderr, " %s",

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

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

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

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

if (msg)

CVSweb