mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.186 and 1.194

version 1.186, 2014/08/23 00:34:59

version 1.194, 2014/10/25 01:03:52

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:ikM: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;

case 'l':

search.argmode = ARG_FILE;

outmode = OUTMODE_ALL;

break;

case 'M':

defpaths = optarg;

break;

Line 280 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) {

if (search.argmode == ARG_NAME)

fprintf(stderr, "%s: No entry for %s "

"in the manual.\n", progname, argv[0]);

rc = MANDOCLEVEL_BADARG;

goto out;

}

* For standard man(1) and -a output mode,

* prepare for copying filename pointers

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

Line 378 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 376 main(int argc, char *argv[])

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

#if HAVE_SQLITE3

out:

if (search.argmode != ARG_FILE) {

manpath_free(&paths);

mansearch_free(res, sz);

mansearch_setup(0);

}

Line 400 usage(enum argmode argmode)

Line 440 usage(enum argmode argmode)

switch (argmode) {

case ARG_FILE:

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

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

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

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

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

break;

case ARG_NAME:

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

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

"[-M path] [-m path] [-S arch] [-s section]\n"

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

break;

case ARG_WORD:

fputs("usage: whatis [-V] [-C file] [-M path] [-m path] "

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

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

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

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

break;

case ARG_EXPR:

fputs("usage: apropos [-V] [-C file] [-M path] [-m path] "

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

"[-O outkey] [-S arch]\n"

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

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

break;

}

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

Line 577 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:

fprintf(stderr, "%s: %s: SYSERR: %s: %s",

progname, file, syscall, strerror(errno));

return(MANDOCLEVEL_SYSERR);

}

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

CVSweb