diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-02 16:45:41 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-02 16:45:41 +0000 |
| commit | d3c5aaa494431ae3a2463cc5ca6c9b8f3bf733c0 (patch) | |
| tree | 753baea8b04e6b54660a1e68b1d9fe4e18f51002 /demandoc.c | |
| parent | 2612bc21b4df390b151333c85302d3829cb86e93 (diff) | |
| download | src-d3c5aaa494431ae3a2463cc5ca6c9b8f3bf733c0.tar.gz src-d3c5aaa494431ae3a2463cc5ca6c9b8f3bf733c0.zip | |
Import CVS snapshot of mandoc as of 20150302
Notes
Notes:
svn path=/vendor/mdocml/dist/; revision=279524
Diffstat (limited to 'demandoc.c')
| -rw-r--r-- | demandoc.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/demandoc.c b/demandoc.c index e9aa62afb2ba..f515931d8b91 100644 --- a/demandoc.c +++ b/demandoc.c @@ -1,4 +1,4 @@ -/* $Id: demandoc.c,v 1.12 2014/10/28 17:36:19 schwarze Exp $ */ +/* $Id: demandoc.c,v 1.15 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -44,11 +44,12 @@ main(int argc, char *argv[]) { struct mparse *mp; struct mchars *mchars; - int ch, i, list; + int ch, fd, i, list; extern int optind; - progname = strrchr(argv[0], '/'); - if (progname == NULL) + if (argc < 1) + progname = "demandoc"; + else if ((progname = strrchr(argv[0], '/')) == NULL) progname = argv[0]; else ++progname; @@ -78,15 +79,19 @@ main(int argc, char *argv[]) argv += optind; mchars = mchars_alloc(); - mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, mchars, NULL); + mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL); assert(mp); - if (0 == argc) + if (argc < 1) pmandoc(mp, STDIN_FILENO, "<stdin>", list); for (i = 0; i < argc; i++) { mparse_reset(mp); - pmandoc(mp, -1, argv[i], list); + if (mparse_open(mp, &fd, argv[i]) != MANDOCLEVEL_OK) { + perror(argv[i]); + continue; + } + pmandoc(mp, fd, argv[i], list); } mparse_free(mp); @@ -108,16 +113,12 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list) struct man *man; int line, col; - if (mparse_readfd(mp, fd, fn) >= MANDOCLEVEL_FATAL) { - fprintf(stderr, "%s: Parse failure\n", fn); - return; - } - + mparse_readfd(mp, fd, fn); mparse_result(mp, &mdoc, &man, NULL); line = 1; col = 0; - if (mdoc) + if (mdoc) pmdoc(mdoc_node(mdoc), &line, &col, list); else if (man) pman(man_node(man), &line, &col, list); @@ -167,7 +168,7 @@ again: end = p - 1; while (end > start) - if ('.' == *end || ',' == *end || + if ('.' == *end || ',' == *end || '\'' == *end || '"' == *end || ')' == *end || '!' == *end || '?' == *end || ':' == *end || @@ -199,7 +200,7 @@ again: /* * Print the input word, skipping any special characters. */ - while ('\0' != *p) + while ('\0' != *p) if ('\\' == *p) { p++; esc = mandoc_escape(&p, NULL, NULL); @@ -220,7 +221,7 @@ pline(int line, int *linep, int *col, int list) /* * Print out as many lines as needed to reach parity with the - * original input. + * original input. */ while (*linep < line) { @@ -240,7 +241,7 @@ pmdoc(const struct mdoc_node *p, int *line, int *col, int list) pline(p->line, line, col, list); if (MDOC_TEXT == p->type) pstring(p->string, p->pos, col, list); - if (p->child) + if (p->child) pmdoc(p->child, line, col, list); } } @@ -254,7 +255,7 @@ pman(const struct man_node *p, int *line, int *col, int list) pline(p->line, line, col, list); if (MAN_TEXT == p->type) pstring(p->string, p->pos, col, list); - if (p->child) + if (p->child) pman(p->child, line, col, list); } } |