version 1.278, 2015/10/12 00:08:16 |
version 1.280, 2015/10/15 23:35:55 |
|
|
#include "roff_int.h" |
#include "roff_int.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
/* Maximum number of nested if-else conditionals. */ |
|
#define RSTACK_MAX 128 |
|
|
|
/* Maximum number of string expansions per line, to break infinite loops. */ |
/* Maximum number of string expansions per line, to break infinite loops. */ |
#define EXPAND_LIMIT 1000 |
#define EXPAND_LIMIT 1000 |
|
|
Line 316 struct roffreg { |
|
Line 313 struct roffreg { |
|
|
|
struct roff { |
struct roff { |
struct mparse *parse; /* parse point */ |
struct mparse *parse; /* parse point */ |
const struct mchars *mchars; /* character table */ |
|
struct roffnode *last; /* leaf of stack */ |
struct roffnode *last; /* leaf of stack */ |
int *rstack; /* stack of inverted `ie' values */ |
int *rstack; /* stack of inverted `ie' values */ |
struct roffreg *regtab; /* number registers */ |
struct roffreg *regtab; /* number registers */ |
Line 901 roff_free(struct roff *r) |
|
Line 897 roff_free(struct roff *r) |
|
} |
} |
|
|
struct roff * |
struct roff * |
roff_alloc(struct mparse *parse, const struct mchars *mchars, int options) |
roff_alloc(struct mparse *parse, int options) |
{ |
{ |
struct roff *r; |
struct roff *r; |
|
|
r = mandoc_calloc(1, sizeof(struct roff)); |
r = mandoc_calloc(1, sizeof(struct roff)); |
r->parse = parse; |
r->parse = parse; |
r->mchars = mchars; |
|
r->options = options; |
r->options = options; |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->rstackpos = -1; |
r->rstackpos = -1; |
Line 1344 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1339 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
esc = mandoc_escape(&cp, &stnam, &inaml); |
esc = mandoc_escape(&cp, &stnam, &inaml); |
if (esc == ESCAPE_ERROR || |
if (esc == ESCAPE_ERROR || |
(esc == ESCAPE_SPECIAL && |
(esc == ESCAPE_SPECIAL && |
mchars_spec2cp(r->mchars, stnam, inaml) < 0)) |
mchars_spec2cp(stnam, inaml) < 0)) |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
r->parse, ln, (int)(stesc - buf->buf), |
r->parse, ln, (int)(stesc - buf->buf), |
"%.*s", (int)(cp - stesc), stesc); |
"%.*s", (int)(cp - stesc), stesc); |