mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.188 and 1.196

version 1.188, 2014/08/30 18:08:10

version 1.196, 2014/10/30 17:15:28

Line 64 enum outt {

OUTT_TREE, /* -Ttree */

OUTT_MAN, /* -Tman */

OUTT_HTML, /* -Thtml */

OUTT_XHTML, /* -Txhtml */

OUTT_LINT, /* -Tlint */

OUTT_PS, /* -Tps */

OUTT_PDF /* -Tpdf */

Line 72 enum outt {

Line 71 enum outt {

struct curparse {

struct mparse *mp;

struct mchars *mchars; /* character table */

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

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

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

Line 82 struct curparse {

char outopts[BUFSIZ]; /* buf of output opts */

};

static int koptions(int *, char *);

static int moptions(int *, char *);

static void mmsg(enum mandocerr, enum mandoclevel,

const char *, int, int, const char *);

static void parse(struct curparse *, int,

const char *, enum mandoclevel *);

static enum mandoclevel passthrough(const char *);

static enum mandoclevel passthrough(const char *, int);

static void spawn_pager(void);

static int toptions(struct curparse *, char *);

static void usage(enum argmode) __attribute__((noreturn));

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

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

#endif

enum mandoclevel rc;

enum outmode outmode;

pid_t child_pid;

int fd;

int show_usage;

int use_pager;

int options;

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

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

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

curp.outtype = OUTT_ASCII;

curp.wlevel = MANDOCLEVEL_FATAL;

options = MPARSE_SO;

options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;

defos = NULL;

use_pager = 1;

show_usage = 0;

outmode = OUTMODE_DEF;

while (-1 != (c = getopt(argc, argv, "aC:cfI:iklM:m:O:S:s:T:VW:w"))) {

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

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

switch (c) {

case 'a':

outmode = OUTMODE_ALL;

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

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

case 'f':

search.argmode = ARG_WORD;

break;

case 'h':

(void)strlcat(curp.outopts, "synopsis,", BUFSIZ);

outmode = OUTMODE_ALL;

break;

case 'I':

if (strncmp(optarg, "os=", 3)) {

fprintf(stderr,

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

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

case 'i':

outmode = OUTMODE_INT;

break;

case 'K':

if ( ! koptions(&options, optarg))

return((int)MANDOCLEVEL_BADARG);

break;

case 'k':

search.argmode = ARG_EXPR;

break;

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

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

mansearch_setup(1);

if( ! mansearch(&search, &paths, argc, argv, &res, &sz))

usage(search.argmode);

manpath_free(&paths);

resp = res;

if (sz == 0) {

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

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

if (use_pager && isatty(STDOUT_FILENO))

spawn_pager();

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

curp.mchars = mchars_alloc();

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

curp.mchars, defos);

* Conditionally start up the lookaside buffer before parsing.

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

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

while (argc) {

#if HAVE_SQLITE3

if (resp != NULL) {

if (resp->form)

rc = mparse_open(curp.mp, &fd, resp->file,

parse(&curp, -1, resp->file, &rc);

&child_pid);

else

if (fd == -1)

rc = passthrough(resp->file);

/* nothing */;

else if (resp->form & FORM_SRC) {

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

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

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

} else

rc = passthrough(resp->file, fd);

resp++;

} else

#endif

parse(&curp, -1, *argv++, &rc);

{

rc = mparse_open(curp.mp, &fd, *argv++,

&child_pid);

if (fd != -1)

parse(&curp, fd, argv[-1], &rc);

}

if (child_pid &&

mparse_wait(curp.mp, child_pid) != MANDOCLEVEL_OK)

rc = MANDOCLEVEL_SYSERR;

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

break;

argc--;

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

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

if (curp.outfree)

(*curp.outfree)(curp.outdata);

if (curp.mp)

mparse_free(curp.mp);

mchars_free(curp.mchars);

#if HAVE_SQLITE3

out:

if (search.argmode != ARG_FILE) {

manpath_free(&paths);

mansearch_free(res, sz);

mansearch_setup(0);

}

Line 412 usage(enum argmode argmode)

Line 442 usage(enum argmode argmode)

switch (argmode) {

case ARG_FILE:

fputs("usage: mandoc [-acfklV] [-Ios=name] "

fputs("usage: mandoc [-acfhklV] [-Ios=name] "

"[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n"

"[-Kencoding] [-mformat] [-Ooption]\n"

"\t [file ...]\n", stderr);

"\t [-Toutput] [-Wlevel] [file ...]\n", stderr);

break;

case ARG_NAME:

fputs("usage: man [-acfhklVw] [-C file] "

Line 422 usage(enum argmode argmode)

Line 452 usage(enum argmode argmode)

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

break;

case ARG_WORD:

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

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

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

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

break;

case ARG_EXPR:

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

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

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

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

break;

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

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

if ( ! (curp->outman && curp->outmdoc)) {

switch (curp->outtype) {

case OUTT_XHTML:

curp->outdata = xhtml_alloc(curp->outopts);

curp->outfree = html_free;

break;

case OUTT_HTML:

curp->outdata = html_alloc(curp->outopts);

curp->outdata = html_alloc(curp->mchars,

curp->outopts);

curp->outfree = html_free;

break;

case OUTT_UTF8:

curp->outdata = utf8_alloc(curp->outopts);

curp->outdata = utf8_alloc(curp->mchars,

curp->outopts);

curp->outfree = ascii_free;

break;

case OUTT_LOCALE:

curp->outdata = locale_alloc(curp->outopts);

curp->outdata = locale_alloc(curp->mchars,

curp->outopts);

curp->outfree = ascii_free;

break;

case OUTT_ASCII:

curp->outdata = ascii_alloc(curp->outopts);

curp->outdata = ascii_alloc(curp->mchars,

curp->outopts);

curp->outfree = ascii_free;

break;

case OUTT_PDF:

curp->outdata = pdf_alloc(curp->outopts);

curp->outdata = pdf_alloc(curp->mchars,

curp->outopts);

curp->outfree = pspdf_free;

break;

case OUTT_PS:

curp->outdata = ps_alloc(curp->outopts);

curp->outdata = ps_alloc(curp->mchars,

curp->outopts);

curp->outfree = pspdf_free;

break;

default:

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

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

switch (curp->outtype) {

case OUTT_HTML:

/* FALLTHROUGH */

case OUTT_XHTML:

curp->outman = html_man;

curp->outmdoc = html_mdoc;

break;

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

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

}

static enum mandoclevel

passthrough(const char *file)

passthrough(const char *file, int fd)

{

char buf[BUFSIZ];

const char *syscall;

ssize_t nr, nw, off;

int fd;

fd = open(file, O_RDONLY);

if (fd == -1) {

syscall = "open";

goto fail;

}

while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0)

for (off = 0; off < nr; off += nw)

if ((nw = write(STDOUT_FILENO, buf + off,

(size_t)(nr - off))) == -1 || nw == 0) {

close(fd);

syscall = "write";

goto fail;

}

if (nr == 0) {

close(fd);

if (nr == 0)

return(MANDOCLEVEL_OK);

}

syscall = "read";

fail:

Line 583 fail:

Line 607 fail:

}

static int

koptions(int *options, char *arg)

{

if ( ! strcmp(arg, "utf-8")) {

*options |= MPARSE_UTF8;

*options &= ~MPARSE_LATIN1;

} else if ( ! strcmp(arg, "iso-8859-1")) {

*options |= MPARSE_LATIN1;

*options &= ~MPARSE_UTF8;

} else if ( ! strcmp(arg, "us-ascii")) {

*options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);

} else {

fprintf(stderr, "%s: -K%s: Bad argument\n",

progname, arg);

return(0);

}

return(1);

}

static int

moptions(int *options, char *arg)

{

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

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

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

curp->outtype = OUTT_LOCALE;

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

curp->outtype = OUTT_XHTML;

curp->outtype = OUTT_HTML;

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

curp->outtype = OUTT_PS;

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

CVSweb