mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.211 and 1.212

version 1.211, 2014/06/29 21:20:31

version 1.212, 2014/06/29 22:14:10

Line 187 static int roff_evalstrcond(const char *, int *);

static void roff_free1(struct roff *);

static void roff_freereg(struct roffreg *);

static void roff_freestr(struct roffkv *);

static char *roff_getname(struct roff *, char **, int, int);

static size_t roff_getname(struct roff *, char **, int, int);

static int roff_getnum(const char *, int *, int *);

static int roff_getop(const char *, int *, char *);

static int roff_getregn(const struct roff *,

Line 1318 out:

static enum rofferr

roff_ds(ROFF_ARGS)

{

char *name, *string;

char *string;

const char *name;

size_t namesz;

* A symbol is named by the first word following the macro

* The first word is the name of the string.

* invocation up to a space. Its value is anything after the

* If it is empty or terminated by an escape sequence,

* name's trailing whitespace and optional double-quote. Thus,

* abort the `ds' request without defining anything.

* [.ds foo "bar " ]

* will have `bar " ' as its value.

string = *bufp + pos;

name = string = *bufp + pos;

name = roff_getname(r, &string, ln, pos);

if ('\0' == *name)

return(ROFF_IGN);

/* Read past initial double-quote. */

namesz = roff_getname(r, &string, ln, pos);

if ('\\' == name[namesz])

return(ROFF_IGN);

/* Read past the initial double-quote, if any. */

if ('"' == *string)

string++;

/* The rest is the value. */

roff_setstr(r, name, string, ROFF_as == tok);

roff_setstrn(&r->strtab, name, namesz, string, strlen(string),

ROFF_as == tok);

return(ROFF_IGN);

}

Line 1654 roff_freereg(struct roffreg *reg)

Line 1656 roff_freereg(struct roffreg *reg)

static enum rofferr

roff_nr(ROFF_ARGS)

{

const char *key;

char *key, *val;

char *val;

size_t keysz;

int iv;

char sign;

val = *bufp + pos;

key = val = *bufp + pos;

key = roff_getname(r, &val, ln, pos);

if ('\0' == *key)

return(ROFF_IGN);

keysz = roff_getname(r, &val, ln, pos);

if ('\\' == key[keysz])

return(ROFF_IGN);

key[keysz] = '\0';

sign = *val;

if ('+' == sign || '-' == sign)

val++;

Line 1676 static enum rofferr

Line 1684 static enum rofferr

roff_rr(ROFF_ARGS)

{

struct roffreg *reg, **prev;

const char *name;

char *name, *cp;

char *cp;

size_t namesz;

cp = *bufp + pos;

name = cp = *bufp + pos;

name = roff_getname(r, &cp, ln, pos);

if ('\0' == *name)

return(ROFF_IGN);

namesz = roff_getname(r, &cp, ln, pos);

name[namesz] = '\0';

prev = &r->regtab;

while (1) {

Line 1702 roff_rm(ROFF_ARGS)

Line 1713 roff_rm(ROFF_ARGS)

{

const char *name;

char *cp;

size_t namesz;

cp = *bufp + pos;

while ('\0' != *cp) {

name = roff_getname(r, &cp, ln, (int)(cp - *bufp));

name = cp;

if ('\0' != *name)

namesz = roff_getname(r, &cp, ln, (int)(cp - *bufp));

roff_setstr(r, name, NULL, 0);

roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);

if ('\\' == name[namesz])

break;

}

return(ROFF_IGN);

}

Line 2007 roff_userdef(ROFF_ARGS)

Line 2021 roff_userdef(ROFF_ARGS)

ROFF_REPARSE : ROFF_APPEND);

}

static char *

static size_t

roff_getname(struct roff *r, char **cpp, int ln, int pos)

{

char *name, *cp;

size_t namesz;

name = *cpp;

if ('\0' == *name)

return(name);

return(0);

/* Read until end of name. */

/* Read until end of name and terminate it with NUL. */

for (cp = name; '\0' != *cp && ' ' != *cp; cp++) {

for (cp = name; 1; cp++) {

if ('\0' == *cp || ' ' == *cp) {

namesz = cp - name;

break;

}

if ('\\' != *cp)

continue;

cp++;

if ('\\' == *cp)

continue;

namesz = cp - name - 1;

mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);

*cp = '\0';

mandoc_escape((const char **)&cp, NULL, NULL);

name = cp;

break;

}

/* Nil-terminate name. */

if ('\0' != *cp)

*(cp++) = '\0';

/* Read past spaces. */

while (' ' == *cp)

cp++;

*cpp = cp;

return(name);

return(namesz);

}

CVSweb