mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.137 and 1.138

version 1.137, 2011/04/24 23:51:17

version 1.138, 2011/05/14 16:06:08

Line 20

#endif

#include <assert.h>

#include <errno.h>

#include <ctype.h>

#include <limits.h>

#include <stdlib.h>

#include <string.h>

#include <stdio.h>

#include "mandoc.h"

#include "libroff.h"

Line 206 static void roffnode_push(struct roff *, enum rofft,

Line 203 static void roffnode_push(struct roff *, enum rofft,

const char *, int, int);

static void roffnode_pop(struct roff *);

static enum rofft roff_parse(struct roff *, const char *, int *);

static int roff_parse_nat(const char *, unsigned int *);

/* See roff_hash_find() */

#define ROFF_HASH(p) (p[0] - ASCII_LO)

Line 593 roff_parse(struct roff *r, const char *buf, int *pos)

Line 589 roff_parse(struct roff *r, const char *buf, int *pos)

return(t);

}

static int

roff_parse_nat(const char *buf, unsigned int *res)

{

char *ep;

long lval;

errno = 0;

lval = strtol(buf, &ep, 10);

if (buf[0] == '\0' || *ep != '\0')

return(0);

if ((errno == ERANGE &&

(lval == LONG_MAX || lval == LONG_MIN)) ||

(lval > INT_MAX || lval < 0))

return(0);

*res = (unsigned int)lval;

return(1);

}

/* ARGSUSED */

static enum rofferr

roff_cblock(ROFF_ARGS)

Line 1090 roff_nr(ROFF_ARGS)

Line 1065 roff_nr(ROFF_ARGS)

{

const char *key;

char *val;

int iv;

struct reg *rg;

val = *bufp + pos;

Line 1098 roff_nr(ROFF_ARGS)

Line 1074 roff_nr(ROFF_ARGS)

if (0 == strcmp(key, "nS")) {

rg[(int)REG_nS].set = 1;

if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))

if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)

rg[(int)REG_nS].v.u = 0;

rg[REG_nS].v.u = (unsigned)iv;

else

rg[(int)REG_nS].v.u = 0u;

}

return(ROFF_IGN);

CVSweb