mandoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/main.c between version 1.273.2.4 and 1.290

version 1.273.2.4, 2017/01/09 17:57:15

version 1.290, 2017/05/16 19:06:30

Line 56 enum outmode {

OUTMODE_FLN,

OUTMODE_LST,

OUTMODE_ALL,

OUTMODE_INT,

OUTMODE_ONE

};

Line 67 enum outt {

Line 66 enum outt {

OUTT_TREE, /* -Ttree */

OUTT_MAN, /* -Tman */

OUTT_HTML, /* -Thtml */

OUTT_MARKDOWN, /* -Tmarkdown */

OUTT_LINT, /* -Tlint */

OUTT_PS, /* -Tps */

OUTT_PDF /* -Tpdf */

Line 82 struct curparse {

};

#if HAVE_SQLITE3

int mandocdb(int, char *[]);

#endif

static int fs_lookup(const struct manpaths *,

size_t ipath, const char *,

Line 94 static void fs_search(const struct mansearch *,

Line 92 static void fs_search(const struct mansearch *,

const struct manpaths *, int, char**,

struct manpage **, size_t *);

static int koptions(int *, char *);

static int moptions(int *, char *);

static void moptions(int *, char *);

static void mmsg(enum mandocerr, enum mandoclevel,

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

static void outdata_alloc(struct curparse *);

Line 102 static void parse(struct curparse *, int, const cha

Line 100 static void parse(struct curparse *, int, const cha

static void passthrough(const char *, int, int);

static pid_t spawn_pager(struct tag_files *);

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

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

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

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

static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};

Line 115 int

Line 113 int

main(int argc, char *argv[])

{

struct manconf conf;

struct curparse curp;

struct mansearch search;

struct curparse curp;

struct tag_files *tag_files;

const char *progname;

char *auxpaths;

char *defos;

unsigned char *uc;

struct manpage *res, *resp;

char *conf_file, *defpaths;

const char *progname, *sec, *thisarg;

const char *sec;

char *conf_file, *defpaths, *auxpaths;

char *defos, *oarg;

unsigned char *uc;

size_t i, sz;

int prio, best_prio;

enum outmode outmode;

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

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

setprogname(progname);

#endif

#if HAVE_SQLITE3

if (strncmp(progname, "mandocdb", 8) == 0 ||

strcmp(progname, BINM_MAKEWHATIS) == 0)

return mandocdb(argc, argv);

#endif

#if HAVE_PLEDGE

if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1)

if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)

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

#endif

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

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

memset(&search, 0, sizeof(struct mansearch));

search.outkey = "Nd";

oarg = NULL;

if (strcmp(progname, BINM_MAN) == 0)

search.argmode = ARG_NAME;

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

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

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

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

}

defos = mandoc_strdup(optarg + 3);

break;

case 'i':

outmode = OUTMODE_INT;

break;

case 'K':

if ( ! koptions(&options, optarg))

return (int)MANDOCLEVEL_BADARG;

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

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

auxpaths = optarg;

break;

case 'O':

search.outkey = optarg;

oarg = optarg;

while (optarg != NULL)

manconf_output(&conf.output,

strsep(&optarg, ","));

break;

case 'S':

search.arch = optarg;

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

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

}

if (oarg != NULL) {

if (outmode == OUTMODE_LST)

search.outkey = oarg;

else {

while (oarg != NULL) {

thisarg = oarg;

if (manconf_output(&conf.output,

strsep(&oarg, ","), 0) == 0)

continue;

warnx("-O %s: Bad argument", thisarg);

return (int)MANDOCLEVEL_BADARG;

}

if (outmode == OUTMODE_FLN ||

outmode == OUTMODE_LST ||

!isatty(STDOUT_FILENO))

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

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

#if HAVE_PLEDGE

if (!use_pager)

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

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

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

#endif

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

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

/* man(1), whatis(1), apropos(1) */

if (search.argmode != ARG_FILE) {

if (argc == 0)

usage(search.argmode);

if (search.argmode == ARG_NAME &&

outmode == OUTMODE_ONE)

search.firstmatch = 1;

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

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

/* Access the mandoc database. */

manconf_parse(&conf, conf_file, defpaths, auxpaths);

#if HAVE_SQLITE3

mansearch_setup(1);

if ( ! mansearch(&search, &conf.manpath,

argc, argv, &res, &sz))

usage(search.argmode);

#else

if (search.argmode != ARG_NAME) {

fputs("mandoc: database support not compiled in\n",

stderr);

return (int)MANDOCLEVEL_BADARG;

}

sz = 0;

#endif

if (sz == 0) {

if (search.argmode == ARG_NAME)

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

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

}

#endif

if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))

if (search.argmode == ARG_FILE)

return (int)MANDOCLEVEL_BADARG;

moptions(&options, auxpaths);

mchars_alloc();

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

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

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

if (resp == NULL)

parse(&curp, fd, *argv);

else if (resp->form & FORM_SRC) {

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

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

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

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

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

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

out:

if (search.argmode != ARG_FILE) {

manconf_free(&conf);

#if HAVE_SQLITE3

mansearch_free(res, sz);

mansearch_setup(0);

#endif

}

free(defos);

Line 600 usage(enum argmode argmode)

Line 592 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 633 fs_lookup(const struct manpaths *paths, size_t ipath,

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

glob_t globinfo;

struct manpage *page;

char *file;

int form, globres;

int globres;

enum form form;

form = FORM_SRC;

mandoc_asprintf(&file, "%s/man%s/%s.%s",

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

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

return 0;

found:

#if HAVE_SQLITE3

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

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

#endif

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

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

page->file = file;

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

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

if (man == NULL)

return;

if (man->macroset == MACROSET_MDOC) {

mdoc_validate(man);

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

mdoc_validate(man);

switch (curp->outtype) {

case OUTT_HTML:

html_mdoc(curp->outdata, man);

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

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

case OUTT_PS:

terminal_mdoc(curp->outdata, man);

break;

case OUTT_MARKDOWN:

markdown_mdoc(curp->outdata, man);

break;

default:

break;

}

if (man->macroset == MACROSET_MAN) {

man_validate(man);

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

man_validate(man);

switch (curp->outtype) {

case OUTT_HTML:

html_man(curp->outdata, man);

Line 923 koptions(int *options, char *arg)

Line 917 koptions(int *options, char *arg)

return 1;

}

static int

static void

moptions(int *options, char *arg)

{

if (arg == NULL)

/* nothing to do */;

return;

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

if (strcmp(arg, "doc") == 0)

*options |= MPARSE_MDOC;

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

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

/* nothing to do */;

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

*options |= MPARSE_MAN;

else {

warnx("-m %s: Bad argument", arg);

return 0;

}

return 1;

}

static int

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

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

curp->outtype = OUTT_MAN;

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

curp->outtype = OUTT_HTML;

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

curp->outtype = OUTT_MARKDOWN;

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

curp->outtype = OUTT_UTF8;

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

Line 980 static int

Line 968 static int

woptions(struct curparse *curp, char *arg)

{

char *v, *o;

const char *toks[7];

const char *toks[8];

toks[0] = "stop";

toks[1] = "all";

toks[2] = "warning";

toks[2] = "style";

toks[3] = "error";

toks[3] = "warning";

toks[4] = "unsupp";

toks[4] = "error";

toks[5] = "fatal";

toks[5] = "unsupp";

toks[6] = NULL;

toks[6] = "fatal";

toks[7] = NULL;

while (*arg) {

o = arg;

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

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

break;

case 1:

case 2:

curp->wlevel = MANDOCLEVEL_WARNING;

curp->wlevel = MANDOCLEVEL_STYLE;

break;

case 3:

curp->wlevel = MANDOCLEVEL_ERROR;

curp->wlevel = MANDOCLEVEL_WARNING;

break;

case 4:

curp->wlevel = MANDOCLEVEL_UNSUPP;

curp->wlevel = MANDOCLEVEL_ERROR;

break;

case 5:

curp->wlevel = MANDOCLEVEL_UNSUPP;

break;

case 6:

curp->wlevel = MANDOCLEVEL_BADARG;

break;

default:

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

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

return 0;

}

return 1;

}

CVSweb