version 1.95, 2010/07/21 09:15:48 |
version 1.105, 2010/12/01 16:54:25 |
|
|
#endif |
#endif |
|
|
enum rofft { |
enum rofft { |
|
ROFF_ad, |
ROFF_am, |
ROFF_am, |
ROFF_ami, |
ROFF_ami, |
ROFF_am1, |
ROFF_am1, |
|
|
ROFF_de1, |
ROFF_de1, |
ROFF_ds, |
ROFF_ds, |
ROFF_el, |
ROFF_el, |
|
ROFF_hy, |
ROFF_ie, |
ROFF_ie, |
ROFF_if, |
ROFF_if, |
ROFF_ig, |
ROFF_ig, |
|
ROFF_ne, |
|
ROFF_nh, |
|
ROFF_nr, |
ROFF_rm, |
ROFF_rm, |
|
ROFF_so, |
ROFF_tr, |
ROFF_tr, |
ROFF_cblock, |
ROFF_cblock, |
ROFF_ccond, |
ROFF_ccond, /* FIXME: remove this. */ |
ROFF_nr, |
|
ROFF_MAX |
ROFF_MAX |
}; |
}; |
|
|
Line 130 static enum roffrule roff_evalcond(const char *, int |
|
Line 135 static enum roffrule roff_evalcond(const char *, int |
|
static void roff_freestr(struct roff *); |
static void roff_freestr(struct roff *); |
static const char *roff_getstrn(const struct roff *, |
static const char *roff_getstrn(const struct roff *, |
const char *, size_t); |
const char *, size_t); |
static enum rofferr roff_line(ROFF_ARGS); |
static enum rofferr roff_line_ignore(ROFF_ARGS); |
|
static enum rofferr roff_line_error(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static int roff_res(struct roff *, |
static int roff_res(struct roff *, |
char **, size_t *, int); |
char **, size_t *, int); |
static void roff_setstr(struct roff *, |
static void roff_setstr(struct roff *, |
const char *, const char *); |
const char *, const char *); |
|
static enum rofferr roff_so(ROFF_ARGS); |
|
static char *roff_strdup(const char *); |
|
|
/* See roff_hash_find() */ |
/* See roff_hash_find() */ |
|
|
Line 146 static void roff_setstr(struct roff *, |
|
Line 154 static void roff_setstr(struct roff *, |
|
static struct roffmac *hash[HASHWIDTH]; |
static struct roffmac *hash[HASHWIDTH]; |
|
|
static struct roffmac roffs[ROFF_MAX] = { |
static struct roffmac roffs[ROFF_MAX] = { |
|
{ "ad", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
Line 154 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 163 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ds", roff_ds, NULL, NULL, 0, NULL }, |
{ "ds", roff_ds, NULL, NULL, 0, NULL }, |
{ "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
{ "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
|
{ "hy", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
{ "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
{ "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
{ "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL }, |
{ "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "rm", roff_line, NULL, NULL, 0, NULL }, |
{ "ne", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "tr", roff_line, NULL, NULL, 0, NULL }, |
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL }, |
|
{ "nr", roff_nr, NULL, NULL, 0, NULL }, |
|
{ "rm", roff_line_error, NULL, NULL, 0, NULL }, |
|
{ "so", roff_so, NULL, NULL, 0, NULL }, |
|
{ "tr", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ ".", roff_cblock, NULL, NULL, 0, NULL }, |
{ ".", roff_cblock, NULL, NULL, 0, NULL }, |
{ "\\}", roff_ccond, NULL, NULL, 0, NULL }, |
{ "\\}", roff_ccond, NULL, NULL, 0, NULL }, |
{ "nr", roff_nr, NULL, NULL, 0, NULL }, |
|
}; |
}; |
|
|
static void roff_free1(struct roff *); |
static void roff_free1(struct roff *); |
static enum rofft roff_hash_find(const char *); |
static enum rofft roff_hash_find(const char *); |
static void roff_hash_init(void); |
static void roff_hash_init(void); |
static void roffnode_cleanscope(struct roff *); |
static void roffnode_cleanscope(struct roff *); |
static int roffnode_push(struct roff *, |
static void roffnode_push(struct roff *, |
enum rofft, int, int); |
enum rofft, int, int); |
static void roffnode_pop(struct roff *); |
static void roffnode_pop(struct roff *); |
static enum rofft roff_parse(const char *, int *); |
static enum rofft roff_parse(const char *, int *); |
Line 247 roffnode_pop(struct roff *r) |
|
Line 260 roffnode_pop(struct roff *r) |
|
if (r->rstackpos > -1) |
if (r->rstackpos > -1) |
r->rstackpos--; |
r->rstackpos--; |
|
|
|
ROFF_DEBUG("roff: popping scope\n"); |
r->last = r->last->parent; |
r->last = r->last->parent; |
if (p->end) |
if (p->end) |
free(p->end); |
free(p->end); |
Line 258 roffnode_pop(struct roff *r) |
|
Line 272 roffnode_pop(struct roff *r) |
|
* Push a roff node onto the instruction stack. This must later be |
* Push a roff node onto the instruction stack. This must later be |
* removed with roffnode_pop(). |
* removed with roffnode_pop(). |
*/ |
*/ |
static int |
static void |
roffnode_push(struct roff *r, enum rofft tok, int line, int col) |
roffnode_push(struct roff *r, enum rofft tok, int line, int col) |
{ |
{ |
struct roffnode *p; |
struct roffnode *p; |
|
|
if (NULL == (p = calloc(1, sizeof(struct roffnode)))) { |
p = mandoc_calloc(1, sizeof(struct roffnode)); |
(*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL); |
|
return(0); |
|
} |
|
|
|
p->tok = tok; |
p->tok = tok; |
p->parent = r->last; |
p->parent = r->last; |
p->line = line; |
p->line = line; |
Line 275 roffnode_push(struct roff *r, enum rofft tok, int line |
|
Line 285 roffnode_push(struct roff *r, enum rofft tok, int line |
|
p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY; |
p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY; |
|
|
r->last = p; |
r->last = p; |
return(1); |
|
} |
} |
|
|
|
|
Line 307 roff_free(struct roff *r) |
|
Line 316 roff_free(struct roff *r) |
|
|
|
|
|
struct roff * |
struct roff * |
roff_alloc(struct regset *regs, const mandocmsg msg, void *data) |
roff_alloc(struct regset *regs, void *data, const mandocmsg msg) |
{ |
{ |
struct roff *r; |
struct roff *r; |
|
|
if (NULL == (r = calloc(1, sizeof(struct roff)))) { |
r = mandoc_calloc(1, sizeof(struct roff)); |
(*msg)(MANDOCERR_MEM, data, 0, 0, NULL); |
|
return(0); |
|
} |
|
|
|
r->regs = regs; |
r->regs = regs; |
r->msg = msg; |
r->msg = msg; |
r->data = data; |
r->data = data; |
Line 434 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 439 roff_parseln(struct roff *r, int ln, char **bufp, |
|
if (r->last) { |
if (r->last) { |
t = r->last->tok; |
t = r->last->tok; |
assert(roffs[t].sub); |
assert(roffs[t].sub); |
ROFF_DEBUG("roff: intercept scoped context: %s\n", |
ROFF_DEBUG("roff: intercept scoped context: %s, [%s]\n", |
roffs[t].name); |
roffs[t].name, &(*bufp)[pos]); |
return((*roffs[t].sub) |
return((*roffs[t].sub) |
(r, t, bufp, szp, |
(r, t, bufp, szp, |
ln, pos, pos, offs)); |
ln, pos, pos, offs)); |
Line 650 roff_block(ROFF_ARGS) |
|
Line 655 roff_block(ROFF_ARGS) |
|
pos++; |
pos++; |
} |
} |
|
|
if ( ! roffnode_push(r, tok, ln, ppos)) |
roffnode_push(r, tok, ln, ppos); |
return(ROFF_ERR); |
|
|
|
if ('\0' == (*bufp)[pos]) |
if ('\0' == (*bufp)[pos]) |
return(ROFF_IGN); |
return(ROFF_IGN); |
Line 673 roff_block(ROFF_ARGS) |
|
Line 677 roff_block(ROFF_ARGS) |
|
if (1 == sz && '.' == (*bufp)[sv]) |
if (1 == sz && '.' == (*bufp)[sv]) |
return(ROFF_IGN); |
return(ROFF_IGN); |
|
|
r->last->end = malloc(sz + 1); |
r->last->end = mandoc_malloc(sz + 1); |
|
|
if (NULL == r->last->end) { |
|
(*r->msg)(MANDOCERR_MEM, r->data, ln, pos, NULL); |
|
return(ROFF_ERR); |
|
} |
|
|
|
memcpy(r->last->end, *bufp + sv, sz); |
memcpy(r->last->end, *bufp + sv, sz); |
r->last->end[(int)sz] = '\0'; |
r->last->end[(int)sz] = '\0'; |
|
|
Line 762 roff_cond_sub(ROFF_ARGS) |
|
Line 761 roff_cond_sub(ROFF_ARGS) |
|
{ |
{ |
enum rofft t; |
enum rofft t; |
enum roffrule rr; |
enum roffrule rr; |
struct roffnode *l; |
|
|
|
ppos = pos; |
ppos = pos; |
rr = r->last->rule; |
rr = r->last->rule; |
Line 772 roff_cond_sub(ROFF_ARGS) |
|
Line 770 roff_cond_sub(ROFF_ARGS) |
|
* continue. |
* continue. |
*/ |
*/ |
|
|
l = r->last; |
|
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
|
|
if (l != r->last) |
if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) { |
|
if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1]) |
|
return(roff_ccond |
|
(r, ROFF_ccond, bufp, szp, |
|
ln, pos, pos + 2, offs)); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
|
} |
|
|
if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) |
|
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
|
|
|
/* |
/* |
* A denied conditional must evaluate its children if and only |
* A denied conditional must evaluate its children if and only |
* if they're either structurally required (such as loops and |
* if they're either structurally required (such as loops and |
Line 811 roff_cond_text(ROFF_ARGS) |
|
Line 810 roff_cond_text(ROFF_ARGS) |
|
* scope permits us to do so. |
* scope permits us to do so. |
*/ |
*/ |
|
|
|
/* FIXME: use roff_ccond? */ |
|
|
st = &(*bufp)[pos]; |
st = &(*bufp)[pos]; |
if (NULL == (ep = strstr(st, "\\}"))) { |
if (NULL == (ep = strstr(st, "\\}"))) { |
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
Line 849 roff_evalcond(const char *v, int *pos) |
|
Line 850 roff_evalcond(const char *v, int *pos) |
|
return(ROFFRULE_DENY); |
return(ROFFRULE_DENY); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static enum rofferr |
static enum rofferr |
roff_line(ROFF_ARGS) |
roff_line_ignore(ROFF_ARGS) |
{ |
{ |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
|
/* ARGSUSED */ |
|
static enum rofferr |
|
roff_line_error(ROFF_ARGS) |
|
{ |
|
|
|
(*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name); |
|
return(ROFF_IGN); |
|
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static enum rofferr |
static enum rofferr |
roff_cond(ROFF_ARGS) |
roff_cond(ROFF_ARGS) |
Line 905 roff_cond(ROFF_ARGS) |
|
Line 913 roff_cond(ROFF_ARGS) |
|
return(ROFF_ERR); |
return(ROFF_ERR); |
} |
} |
|
|
if ( ! roffnode_push(r, tok, ln, ppos)) |
roffnode_push(r, tok, ln, ppos); |
return(ROFF_ERR); |
|
|
|
r->last->rule = rule; |
r->last->rule = rule; |
|
|
Line 969 roff_cond(ROFF_ARGS) |
|
Line 976 roff_cond(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_ds(ROFF_ARGS) |
roff_ds(ROFF_ARGS) |
{ |
{ |
char *name, *string, *end; |
char *name, *string; |
|
|
|
/* |
|
* A symbol is named by the first word following the macro |
|
* invocation up to a space. Its value is anything after the |
|
* name's trailing whitespace and optional double-quote. Thus, |
|
* |
|
* [.ds foo "bar " ] |
|
* |
|
* will have `bar " ' as its value. |
|
*/ |
|
|
name = *bufp + pos; |
name = *bufp + pos; |
if ('\0' == *name) |
if ('\0' == *name) |
return(ROFF_IGN); |
return(ROFF_IGN); |
|
|
string = name; |
string = name; |
|
/* Read until end of name. */ |
while (*string && ' ' != *string) |
while (*string && ' ' != *string) |
string++; |
string++; |
|
|
|
/* Nil-terminate name. */ |
if (*string) |
if (*string) |
*(string++) = NULL; |
*(string++) = '\0'; |
if (*string && '"' == *string) |
|
string++; |
/* Read past spaces. */ |
while (*string && ' ' == *string) |
while (*string && ' ' == *string) |
string++; |
string++; |
end = string; |
|
while (*end) |
|
end++; |
|
if (string < end) { |
|
end--; |
|
if (*end == '"') |
|
*end = '\0'; |
|
} |
|
|
|
|
/* Read passed initial double-quote. */ |
|
if (*string && '"' == *string) |
|
string++; |
|
|
|
/* The rest is the value. */ |
roff_setstr(r, name, string); |
roff_setstr(r, name, string); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
Line 1040 roff_nr(ROFF_ARGS) |
|
Line 1057 roff_nr(ROFF_ARGS) |
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
|
/* ARGSUSED */ |
|
static enum rofferr |
|
roff_so(ROFF_ARGS) |
|
{ |
|
char *name; |
|
|
|
(*r->msg)(MANDOCERR_SO, r->data, ln, ppos, NULL); |
|
|
|
/* |
|
* Handle `so'. Be EXTREMELY careful, as we shouldn't be |
|
* opening anything that's not in our cwd or anything beneath |
|
* it. Thus, explicitly disallow traversing up the file-system |
|
* or using absolute paths. |
|
*/ |
|
|
|
name = *bufp + pos; |
|
if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) { |
|
(*r->msg)(MANDOCERR_SOPATH, r->data, ln, pos, NULL); |
|
return(ROFF_ERR); |
|
} |
|
|
|
*offs = pos; |
|
return(ROFF_SO); |
|
} |
|
|
|
static char * |
|
roff_strdup(const char *name) |
|
{ |
|
char *namecopy, *sv; |
|
|
|
/* |
|
* This isn't a nice simple mandoc_strdup() because we must |
|
* handle roff's stupid double-escape rule. |
|
*/ |
|
sv = namecopy = mandoc_malloc(strlen(name) + 1); |
|
while (*name) { |
|
if ('\\' == *name && '\\' == *(name + 1)) |
|
name++; |
|
*namecopy++ = *name++; |
|
} |
|
|
|
*namecopy = '\0'; |
|
return(sv); |
|
} |
|
|
|
|
static void |
static void |
roff_setstr(struct roff *r, const char *name, const char *string) |
roff_setstr(struct roff *r, const char *name, const char *string) |
{ |
{ |
Line 1060 roff_setstr(struct roff *r, const char *name, const ch |
|
Line 1122 roff_setstr(struct roff *r, const char *name, const ch |
|
} else |
} else |
free(n->string); |
free(n->string); |
|
|
n->string = string ? strdup(string) : NULL; |
/* Don't use mandoc_strdup: clean out double-escapes. */ |
|
n->string = string ? roff_strdup(string) : NULL; |
|
ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, n->string); |
} |
} |
|
|
|
|
Line 1070 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 1134 roff_getstrn(const struct roff *r, const char *name, s |
|
const struct roffstr *n; |
const struct roffstr *n; |
|
|
n = r->first_string; |
n = r->first_string; |
while (n && (strncmp(name, n->name, len) || '\0' != n->name[len])) |
while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len])) |
n = n->next; |
n = n->next; |
|
|
return(n ? n->string : NULL); |
return(n ? n->string : NULL); |