version 1.19, 2009/04/02 16:26:35 |
version 1.20, 2009/04/02 16:37:40 |
Line 76 struct curparse { |
|
Line 76 struct curparse { |
|
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define IGN_ESCAPE (1 << 1) /* Ignore bad escapes. */ |
#define IGN_ESCAPE (1 << 1) /* Ignore bad escapes. */ |
#define IGN_MACRO (1 << 2) /* Ignore unknown macros. */ |
#define IGN_MACRO (1 << 2) /* Ignore unknown macros. */ |
|
#define NO_IGN_MACRO (1 << 3) |
|
|
typedef int (*out_run)(void *, const struct man *, |
typedef int (*out_run)(void *, const struct man *, |
const struct mdoc *); |
const struct mdoc *); |
Line 264 man_init(struct curparse *curp) |
|
Line 265 man_init(struct curparse *curp) |
|
mancb.man_err = merr; |
mancb.man_err = merr; |
mancb.man_warn = manwarn; |
mancb.man_warn = manwarn; |
|
|
pflags = 0; |
/* Set command defaults. */ |
|
pflags = MAN_IGN_MACRO; |
|
|
if (curp->fflags & IGN_MACRO) |
if (curp->fflags & IGN_MACRO) |
pflags |= MAN_IGN_MACRO; |
pflags |= MAN_IGN_MACRO; |
|
if (curp->fflags & NO_IGN_MACRO) |
|
pflags &= ~MAN_IGN_MACRO; |
|
|
if (NULL == (man = man_alloc(curp, pflags, &mancb))) |
if (NULL == (man = man_alloc(curp, pflags, &mancb))) |
warnx("memory exhausted"); |
warnx("memory exhausted"); |
|
|
foptions(int *fflags, char *arg) |
foptions(int *fflags, char *arg) |
{ |
{ |
char *v; |
char *v; |
char *toks[4]; |
char *toks[5]; |
|
|
toks[0] = "ign-scope"; |
toks[0] = "ign-scope"; |
toks[1] = "ign-escape"; |
toks[1] = "ign-escape"; |
toks[2] = "ign-macro"; |
toks[2] = "ign-macro"; |
toks[3] = NULL; |
toks[4] = "no-ign-macro"; |
|
toks[5] = NULL; |
|
|
while (*arg) |
while (*arg) |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, toks, &v)) { |
Line 557 foptions(int *fflags, char *arg) |
|
Line 562 foptions(int *fflags, char *arg) |
|
break; |
break; |
case (2): |
case (2): |
*fflags |= IGN_MACRO; |
*fflags |= IGN_MACRO; |
|
break; |
|
case (3): |
|
*fflags |= NO_IGN_MACRO; |
break; |
break; |
default: |
default: |
warnx("bad argument: -f%s", arg); |
warnx("bad argument: -f%s", arg); |