version 1.90, 2010/06/27 15:52:41 |
version 1.91, 2010/06/27 16:36:22 |
Line 155 static int roffnode_push(struct roff *, |
|
Line 155 static int 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 *); |
static int roff_parse_nat(const char *, int *); |
static int roff_parse_nat(const char *, unsigned int *); |
|
|
/* See roff_hash_find() */ |
/* See roff_hash_find() */ |
#define ROFF_HASH(p) (p[0] - ASCII_LO) |
#define ROFF_HASH(p) (p[0] - ASCII_LO) |
Line 425 roff_parse(const char *buf, int *pos) |
|
Line 425 roff_parse(const char *buf, int *pos) |
|
|
|
|
|
static int |
static int |
roff_parse_nat(const char *buf, int *res) |
roff_parse_nat(const char *buf, unsigned int *res) |
{ |
{ |
char *ep; |
char *ep; |
long lval; |
long lval; |
Line 436 roff_parse_nat(const char *buf, int *res) |
|
Line 436 roff_parse_nat(const char *buf, int *res) |
|
return(0); |
return(0); |
if ((errno == ERANGE && |
if ((errno == ERANGE && |
(lval == LONG_MAX || lval == LONG_MIN)) || |
(lval == LONG_MAX || lval == LONG_MIN)) || |
(lval > INT_MAX || lval <= 0)) |
(lval > INT_MAX || lval < 0)) |
return(0); |
return(0); |
|
|
*res = (int)lval; |
*res = (unsigned int)lval; |
return(1); |
return(1); |
} |
} |
|
|
Line 882 static enum rofferr |
|
Line 882 static enum rofferr |
|
roff_nr(ROFF_ARGS) |
roff_nr(ROFF_ARGS) |
{ |
{ |
const char *key, *val; |
const char *key, *val; |
|
struct reg *rg; |
|
|
key = &(*bufp)[pos]; |
key = &(*bufp)[pos]; |
|
rg = r->regs->regs; |
|
|
/* Parse register request. */ |
/* Parse register request. */ |
while ((*bufp)[pos] && ' ' != (*bufp)[pos]) |
while ((*bufp)[pos] && ' ' != (*bufp)[pos]) |
Line 905 roff_nr(ROFF_ARGS) |
|
Line 907 roff_nr(ROFF_ARGS) |
|
/* Process register token. */ |
/* Process register token. */ |
|
|
if (0 == strcmp(key, "nS")) { |
if (0 == strcmp(key, "nS")) { |
if ( ! roff_parse_nat(val, &r->regs->regs[(int)REG_nS].i)) |
rg[(int)REG_nS].set = 1; |
r->regs->regs[(int)REG_nS].i = 0; |
if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u)) |
|
rg[(int)REG_nS].v.u = 0; |
|
|
ROFF_DEBUG("roff: register nS: %d\n", |
ROFF_DEBUG("roff: register nS: %u\n", |
r->regs->regs[(int)REG_nS].i); |
rg[(int)REG_nS].v.u); |
} else |
} else |
ROFF_DEBUG("roff: ignoring register: %s\n", key); |
ROFF_DEBUG("roff: ignoring register: %s\n", key); |
|
|