version 1.22, 2009/04/03 11:08:39 |
version 1.28, 2009/06/15 10:36:01 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the |
* purpose with or without fee is hereby granted, provided that the above |
* above copyright notice and this permission notice appear in all |
* copyright notice and this permission notice appear in all copies. |
* copies. |
|
* |
* |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* PERFORMANCE OF THIS SOFTWARE. |
|
*/ |
*/ |
#include <sys/stat.h> |
#include <sys/stat.h> |
|
|
Line 71 struct curparse { |
|
Line 69 struct curparse { |
|
#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ |
#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ |
#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ |
#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ |
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
int fflags; /* Per-intt flags. */ |
int fflags; |
|
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
|
#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
|
#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ |
|
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
enum intt inttype; /* Input parsers. */ |
enum intt inttype; /* Input parsers. */ |
struct man *man; |
struct man *man; |
struct man *lastman; |
struct man *lastman; |
Line 84 struct curparse { |
|
Line 86 struct curparse { |
|
void *outdata; |
void *outdata; |
}; |
}; |
|
|
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
|
#define IGN_ESCAPE (1 << 1) /* Ignore bad escapes. */ |
|
#define IGN_MACRO (1 << 2) /* Ignore unknown macros. */ |
|
#define NO_IGN_MACRO (1 << 3) |
|
|
|
extern void *ascii_alloc(void); |
extern void *ascii_alloc(void); |
extern int tree_mdoc(void *, const struct mdoc *); |
extern int tree_mdoc(void *, const struct mdoc *); |
extern int tree_man(void *, const struct man *); |
extern int tree_man(void *, const struct man *); |
Line 193 main(int argc, char *argv[]) |
|
Line 190 main(int argc, char *argv[]) |
|
free(blk.buf); |
free(blk.buf); |
if (ln.buf) |
if (ln.buf) |
free(ln.buf); |
free(ln.buf); |
|
|
|
/* TODO: have a curp_free routine. */ |
if (curp.outfree) |
if (curp.outfree) |
(*curp.outfree)(curp.outdata); |
(*curp.outfree)(curp.outdata); |
if (curp.mdoc) |
if (curp.mdoc) |
Line 234 man_init(struct curparse *curp) |
|
Line 233 man_init(struct curparse *curp) |
|
mancb.man_err = merr; |
mancb.man_err = merr; |
mancb.man_warn = manwarn; |
mancb.man_warn = manwarn; |
|
|
pflags = MAN_IGN_MACRO; /* XXX */ |
/* |
|
* Default behaviour is to ignore unknown macros. This is |
|
* specified in mandoc.1. |
|
*/ |
|
|
|
pflags = MAN_IGN_MACRO; |
|
|
|
/* Override default behaviour... */ |
|
|
if (curp->fflags & NO_IGN_MACRO) |
if (curp->fflags & NO_IGN_MACRO) |
pflags &= ~MAN_IGN_MACRO; |
pflags &= ~MAN_IGN_MACRO; |
|
|
Line 253 mdoc_init(struct curparse *curp) |
|
Line 259 mdoc_init(struct curparse *curp) |
|
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct mdoc_cb mdoccb; |
struct mdoc_cb mdoccb; |
|
|
mdoccb.mdoc_msg = NULL; |
|
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_warn = mdocwarn; |
mdoccb.mdoc_warn = mdocwarn; |
|
|
pflags = 0; /* XXX */ |
/* |
|
* Default behaviour is to ignore unknown macros, escape |
|
* sequences and characters (very liberal). This is specified |
|
* in mandoc.1. |
|
*/ |
|
|
|
pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; |
|
|
|
/* Override default behaviour... */ |
|
|
if (curp->fflags & IGN_SCOPE) |
if (curp->fflags & IGN_SCOPE) |
pflags |= MDOC_IGN_SCOPE; |
pflags |= MDOC_IGN_SCOPE; |
if (curp->fflags & IGN_ESCAPE) |
if (curp->fflags & NO_IGN_ESCAPE) |
pflags |= MDOC_IGN_ESCAPE; |
pflags &= ~MDOC_IGN_ESCAPE; |
if (curp->fflags & IGN_MACRO) |
if (curp->fflags & NO_IGN_MACRO) |
pflags |= MDOC_IGN_MACRO; |
pflags &= ~MDOC_IGN_MACRO; |
|
if (curp->fflags & NO_IGN_CHARS) |
|
pflags &= ~MDOC_IGN_CHARS; |
|
|
if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) |
if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) |
warnx("memory allocated"); |
warnx("memory exhausted"); |
|
|
return(mdoc); |
return(mdoc); |
} |
} |
Line 364 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 379 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
continue; |
continue; |
} |
} |
|
|
/* Check for CPP-escaped newline. */ |
/* Check for CPP-escaped newline. */ |
|
|
if (pos > 0 && '\\' == ln->buf[pos - 1]) { |
if (pos > 0 && '\\' == ln->buf[pos - 1]) { |
for (j = pos - 1; j >= 0; j--) |
for (j = pos - 1; j >= 0; j--) |
|
|
foptions(int *fflags, char *arg) |
foptions(int *fflags, char *arg) |
{ |
{ |
char *v; |
char *v; |
char *toks[5]; |
char *toks[6]; |
|
|
toks[0] = "ign-scope"; |
toks[0] = "ign-scope"; |
toks[1] = "ign-escape"; |
toks[1] = "no-ign-escape"; |
toks[2] = "ign-macro"; |
toks[2] = "no-ign-macro"; |
toks[3] = "no-ign-macro"; |
toks[3] = "no-ign-chars"; |
toks[4] = NULL; |
toks[4] = "strict"; |
|
toks[5] = NULL; |
|
|
while (*arg) |
while (*arg) |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, toks, &v)) { |
Line 563 foptions(int *fflags, char *arg) |
|
Line 579 foptions(int *fflags, char *arg) |
|
*fflags |= IGN_SCOPE; |
*fflags |= IGN_SCOPE; |
break; |
break; |
case (1): |
case (1): |
*fflags |= IGN_ESCAPE; |
*fflags |= NO_IGN_ESCAPE; |
break; |
break; |
case (2): |
case (2): |
*fflags |= IGN_MACRO; |
*fflags |= NO_IGN_MACRO; |
break; |
break; |
case (3): |
case (3): |
*fflags |= NO_IGN_MACRO; |
*fflags |= NO_IGN_CHARS; |
break; |
break; |
|
case (4): |
|
*fflags |= NO_IGN_ESCAPE | |
|
NO_IGN_MACRO | NO_IGN_CHARS; |
|
break; |
default: |
default: |
warnx("bad argument: -f%s", arg); |
warnx("bad argument: -f%s", arg); |
return(0); |
return(0); |
Line 626 merr(void *arg, int line, int col, const char *msg) |
|
Line 646 merr(void *arg, int line, int col, const char *msg) |
|
struct curparse *curp; |
struct curparse *curp; |
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
|
|
warnx("%s:%d: error: %s (column %d)", |
warnx("%s:%d: error: %s (column %d)", |
curp->file, line, msg, col); |
curp->file, line, msg, col); |
|
|
|
/* Always exit on errors... */ |
return(0); |
return(0); |
} |
} |
|
|
Line 662 mdocwarn(void *arg, int line, int col, |
|
Line 683 mdocwarn(void *arg, int line, int col, |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
return(1); |
return(1); |
|
|
|
/* |
|
* If the -Werror flag is passed in, as in gcc, then all |
|
* warnings are considered as errors. |
|
*/ |
|
|
warnx("%s: considering warnings as errors", |
warnx("%s: considering warnings as errors", |
__progname); |
__progname); |
Line 684 manwarn(void *arg, int line, int col, const char *msg) |
|
Line 710 manwarn(void *arg, int line, int col, const char *msg) |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
return(1); |
return(1); |
|
|
|
/* |
|
* If the -Werror flag is passed in, as in gcc, then all |
|
* warnings are considered as errors. |
|
*/ |
|
|
warnx("%s: considering warnings as errors", |
warnx("%s: considering warnings as errors", |
__progname); |
__progname); |