mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.344 and 1.363

version 1.344, 2018/12/04 02:53:51

version 1.363, 2019/02/06 21:11:43

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 28

#include <stdlib.h>

#include <string.h>

#include "mandoc.h"

#include "mandoc_aux.h"

#include "mandoc_ohash.h"

#include "mandoc.h"

#include "roff.h"

#include "mandoc_parse.h"

#include "libmandoc.h"

#include "roff_int.h"

#include "libroff.h"

#include "tbl_parse.h"

#include "eqn_parse.h"

* ASCII_ESC is used to signal from roff_getarg() to roff_expand()

* that an escape sequence resulted from copy-in processing and

* needs to be checked or interpolated. As it is used nowhere

* else, it is defined here rather than in a header file.

#define ASCII_ESC 27

/* Maximum number of string expansions per line, to break infinite loops. */

#define EXPAND_LIMIT 1000

Line 96 struct mctx {

Line 106 struct mctx {

};

struct roff {

struct mparse *parse; /* parse point */

struct roff_man *man; /* mdoc or man parser */

struct roffnode *last; /* leaf of stack */

struct mctx *mstack; /* stack of macro contexts */

Line 167 static int roffnode_cleanscope(struct roff *);

Line 176 static int roffnode_cleanscope(struct roff *);

static int roffnode_pop(struct roff *);

static void roffnode_push(struct roff *, enum roff_tok,

const char *, int, int);

static void roff_addtbl(struct roff_man *, struct tbl_node *);

static void roff_addtbl(struct roff_man *, int, struct tbl_node *);

static int roff_als(ROFF_ARGS);

static int roff_block(ROFF_ARGS);

static int roff_block_text(ROFF_ARGS);

static int roff_block_sub(ROFF_ARGS);

static int roff_br(ROFF_ARGS);

static int roff_cblock(ROFF_ARGS);

static int roff_cc(ROFF_ARGS);

static int roff_ccond(struct roff *, int, int);

Line 190 static int roff_evalnum(struct roff *, int,

Line 198 static int roff_evalnum(struct roff *, int,

static int roff_evalpar(struct roff *, int,

const char *, int *, int *, int);

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

static int roff_expand(struct roff *, struct buf *,

int, int, char);

static void roff_free1(struct roff *);

static void roff_freereg(struct roffreg *);

static void roff_freestr(struct roffkv *);

Line 210 static int roff_line_ignore(ROFF_ARGS);

Line 220 static int roff_line_ignore(ROFF_ARGS);

static void roff_man_alloc1(struct roff_man *);

static void roff_man_free1(struct roff_man *);

static int roff_manyarg(ROFF_ARGS);

static int roff_noarg(ROFF_ARGS);

static int roff_nop(ROFF_ARGS);

static int roff_nr(ROFF_ARGS);

static int roff_onearg(ROFF_ARGS);

Line 218 static enum roff_tok roff_parse(struct roff *, char *

Line 229 static enum roff_tok roff_parse(struct roff *, char *

static int roff_parsetext(struct roff *, struct buf *,

int, int *);

static int roff_renamed(ROFF_ARGS);

static int roff_res(struct roff *, struct buf *, int, int);

static int roff_return(ROFF_ARGS);

static int roff_rm(ROFF_ARGS);

static int roff_rn(ROFF_ARGS);

Line 247 static int roff_userdef(ROFF_ARGS);

Line 257 static int roff_userdef(ROFF_ARGS);

#define ROFFNUM_WHITE (1 << 1) /* Skip whitespace in roff_evalnum(). */

const char *__roff_name[MAN_MAX + 1] = {

"br", "ce", "ft", "ll",

"br", "ce", "fi", "ft",

"mc", "po", "rj", "sp",

"ll", "mc", "nf",

"po", "rj", "sp",

"ta", "ti", NULL,

"ab", "ad", "af", "aln",

"als", "am", "am1", "ami",

Line 347 const char *__roff_name[MAN_MAX + 1] = {

Line 358 const char *__roff_name[MAN_MAX + 1] = {

"HP", "SM", "SB", "BI",

"IB", "BR", "RB", "R",

"B", "I", "IR", "RI",

"nf", "fi",

"RE", "RS", "DT", "UC",

"PD", "AT", "in",

"SY", "YS", "OP",

Line 357 const char *__roff_name[MAN_MAX + 1] = {

Line 367 const char *__roff_name[MAN_MAX + 1] = {

const char *const *roff_name = __roff_name;

static struct roffmac roffs[TOKEN_NONE] = {

{ roff_br, NULL, NULL, 0 }, /* br */

{ roff_noarg, NULL, NULL, 0 }, /* br */

{ roff_onearg, NULL, NULL, 0 }, /* ce */

{ roff_noarg, NULL, NULL, 0 }, /* fi */

{ roff_onearg, NULL, NULL, 0 }, /* ft */

{ roff_onearg, NULL, NULL, 0 }, /* ll */

{ roff_onearg, NULL, NULL, 0 }, /* mc */

{ roff_noarg, NULL, NULL, 0 }, /* nf */

{ roff_onearg, NULL, NULL, 0 }, /* po */

{ roff_onearg, NULL, NULL, 0 }, /* rj */

{ roff_onearg, NULL, NULL, 0 }, /* sp */

Line 391 static struct roffmac roffs[TOKEN_NONE] = {

Line 403 static struct roffmac roffs[TOKEN_NONE] = {

{ roff_unsupp, NULL, NULL, 0 }, /* break */

{ roff_line_ignore, NULL, NULL, 0 }, /* breakchar */

{ roff_line_ignore, NULL, NULL, 0 }, /* brnl */

{ roff_br, NULL, NULL, 0 }, /* brp */

{ roff_noarg, NULL, NULL, 0 }, /* brp */

{ roff_line_ignore, NULL, NULL, 0 }, /* brpnl */

{ roff_unsupp, NULL, NULL, 0 }, /* c2 */

{ roff_cc, NULL, NULL, 0 }, /* cc */

Line 717 roffnode_push(struct roff *r, enum roff_tok tok, const

Line 729 roffnode_push(struct roff *r, enum roff_tok tok, const

static void

roff_free1(struct roff *r)

{

struct tbl_node *tbl;

int i;

while (NULL != (tbl = r->first_tbl)) {

tbl_free(r->first_tbl);

r->first_tbl = tbl->next;

tbl_free(tbl);

}

r->first_tbl = r->last_tbl = r->tbl = NULL;

if (r->last_eqn != NULL)

eqn_free(r->last_eqn);

r->last_eqn = r->eqn = NULL;

while (r->mstackpos >= 0)

Line 783 roff_free(struct roff *r)

Line 790 roff_free(struct roff *r)

}

struct roff *

roff_alloc(struct mparse *parse, int options)

roff_alloc(int options)

{

struct roff *r;

r = mandoc_calloc(1, sizeof(struct roff));

r->parse = parse;

r->reqtab = roffhash_alloc(0, ROFF_RENAMED);

r->options = options;

r->format = options & (MPARSE_MDOC | MPARSE_MAN);

Line 803 roff_alloc(struct mparse *parse, int options)

Line 809 roff_alloc(struct mparse *parse, int options)

static void

roff_man_free1(struct roff_man *man)

{

if (man->meta.first != NULL)

if (man->first != NULL)

roff_node_delete(man, man->meta.first);

roff_node_delete(man, man->first);

free(man->meta.msec);

free(man->meta.vol);

free(man->meta.os);

Line 813 roff_man_free1(struct roff_man *man)

Line 818 roff_man_free1(struct roff_man *man)

free(man->meta.title);

free(man->meta.name);

free(man->meta.date);

free(man->meta.sodest);

}

static void

void

roff_man_alloc1(struct roff_man *man)

roff_state_reset(struct roff_man *man)

{

man->last = man->meta.first;

memset(&man->meta, 0, sizeof(man->meta));

man->first = mandoc_calloc(1, sizeof(*man->first));

man->first->type = ROFFT_ROOT;

man->last = man->first;

man->last_es = NULL;

man->flags = 0;

man->macroset = MACROSET_NONE;

man->lastsec = man->lastnamed = SEC_NONE;

man->next = ROFF_NEXT_CHILD;

roff_setreg(man->roff, "nS", 0, '=');

}

static void

roff_man_alloc1(struct roff_man *man)

{

memset(&man->meta, 0, sizeof(man->meta));

man->meta.first = mandoc_calloc(1, sizeof(*man->meta.first));

man->meta.first->type = ROFFT_ROOT;

man->meta.macroset = MACROSET_NONE;

roff_state_reset(man);

}

void

roff_man_reset(struct roff_man *man)

{

roff_man_free1(man);

roff_man_alloc1(man);

}

Line 841 roff_man_reset(struct roff_man *man)

Line 852 roff_man_reset(struct roff_man *man)

void

roff_man_free(struct roff_man *man)

{

roff_man_free1(man);

free(man);

}

struct roff_man *

roff_man_alloc(struct roff *roff, struct mparse *parse,

roff_man_alloc(struct roff *roff, const char *os_s, int quick)

const char *os_s, int quick)

{

struct roff_man *man;

man = mandoc_calloc(1, sizeof(*man));

man->parse = parse;

man->roff = roff;

man->os_s = os_s;

man->quick = quick;

Line 881 roff_node_alloc(struct roff_man *man, int line, int po

Line 889 roff_node_alloc(struct roff_man *man, int line, int po

n->flags |= NODE_SYNPRETTY;

else

n->flags &= ~NODE_SYNPRETTY;

if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL)

n->flags |= NODE_NOFILL;

else

n->flags &= ~NODE_NOFILL;

if (man->flags & MDOC_NEWLINE)

n->flags |= NODE_LINE;

man->flags &= ~MDOC_NEWLINE;

Line 1013 roff_body_alloc(struct roff_man *man, int line, int po

Line 1025 roff_body_alloc(struct roff_man *man, int line, int po

}

static void

roff_addtbl(struct roff_man *man, struct tbl_node *tbl)

roff_addtbl(struct roff_man *man, int line, struct tbl_node *tbl)

{

struct roff_node *n;

const struct tbl_span *span;

struct tbl_span *span;

if (man->macroset == MACROSET_MAN)

if (man->meta.macroset == MACROSET_MAN)

man_breakscope(man, ROFF_TS);

while ((span = tbl_span(tbl)) != NULL) {

n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);

n = roff_node_alloc(man, line, 0, ROFFT_TBL, TOKEN_NONE);

n->span = span;

roff_node_append(man, n);

n->flags |= NODE_VALID | NODE_ENDED;

Line 1062 roff_node_unlink(struct roff_man *man, struct roff_nod

Line 1074 roff_node_unlink(struct roff_man *man, struct roff_nod

man->next = ROFF_NEXT_SIBLING;

}

if (man->first == n)

if (man->meta.first == n)

man->first = NULL;

man->meta.first = NULL;

}

void

Line 1082 roff_node_free(struct roff_node *n)

Line 1094 roff_node_free(struct roff_node *n)

mdoc_argv_free(n->args);

if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM)

free(n->norm);

if (n->eqn != NULL)

eqn_box_free(n->eqn);

free(n->string);

free(n);

}

Line 1150 deroff(char **dest, const struct roff_node *n)

Line 1161 deroff(char **dest, const struct roff_node *n)

/* --- main functions of the roff parser ---------------------------------- */

* In the current line, expand escape sequences that tend to get

* In the current line, expand escape sequences that produce parsable

* used in numerical expressions and conditional requests.

* input text. Also check the syntax of the remaining escape sequences,

* Also check the syntax of the remaining escape sequences.

* which typically produce output glyphs or change formatter state.

static int

roff_res(struct roff *r, struct buf *buf, int ln, int pos)

roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char newesc)

{

struct mctx *ctx; /* current macro call context */

char ubuf[24]; /* buffer to print the number */

struct roff_node *n; /* used for header comments */

const char *start; /* start of the string to process */

char *stesc; /* start of an escape sequence ('\\') */

const char *esct; /* type of esccape sequence */

char *ep; /* end of comment string */

const char *stnam; /* start of the name, after "[(*" */

const char *cp; /* end of the name, e.g. before ']' */

Line 1171 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1183 roff_res(struct roff *r, struct buf *buf, int ln, int

size_t naml; /* actual length of the escape name */

size_t asz; /* length of the replacement */

size_t rsz; /* length of the rest of the string */

enum mandoc_esc esc; /* type of the escape sequence */

int inaml; /* length returned from mandoc_escape() */

int expand_count; /* to avoid infinite loops */

int npos; /* position in numeric expression */

Line 1180 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1191 roff_res(struct roff *r, struct buf *buf, int ln, int

int done; /* no more input available */

int deftype; /* type of definition to paste */

int rcsid; /* kind of RCS id seen */

enum mandocerr err; /* for escape sequence problems */

char sign; /* increment number register */

char term; /* character terminating the escape */

Line 1188 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1200 roff_res(struct roff *r, struct buf *buf, int ln, int

done = 0;

start = buf->buf + pos;

for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) {

if (stesc[0] != r->escape || stesc[1] == '\0')

if (stesc[0] != newesc || stesc[1] == '\0')

continue;

stesc++;

if (*stesc != '"' && *stesc != '#')

Line 1208 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1220 roff_res(struct roff *r, struct buf *buf, int ln, int

isalnum((unsigned char)*cp) == 0 &&

strchr(cp, '$') != NULL) {

if (r->man->meta.rcsids & rcsid)

mandoc_msg(MANDOCERR_RCS_REP, r->parse,

mandoc_msg(MANDOCERR_RCS_REP, ln,

ln, stesc + 1 - buf->buf, stesc + 1);

(int)(stesc - buf->buf) + 1,

"%s", stesc + 1);

r->man->meta.rcsids |= rcsid;

}

Line 1221 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1234 roff_res(struct roff *r, struct buf *buf, int ln, int

ep--;

}

if (*ep == ' ' || *ep == '\t')

mandoc_msg(MANDOCERR_SPACE_EOL, r->parse,

mandoc_msg(MANDOCERR_SPACE_EOL,

ln, ep - buf->buf, NULL);

ln, (int)(ep - buf->buf), NULL);

* Save comments preceding the title macro

* in the syntax tree.

if (r->format == 0) {

if (newesc != ASCII_ESC && r->format == 0) {

while (*ep == ' ' || *ep == '\t')

ep--;

ep[1] = '\0';

Line 1270 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1283 roff_res(struct roff *r, struct buf *buf, int ln, int

expand_count = 0;

while (stesc >= start) {

if (*stesc != newesc) {

/* Search backwards for the next backslash. */

* If we have a non-standard escape character,

* escape literal backslashes because all

* processing in subsequent functions uses

* the standard escaping rules.

if (*stesc != r->escape) {

if (newesc != ASCII_ESC && *stesc == '\\') {

if (*stesc == '\\') {

*stesc = '\0';

buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s",

buf->buf, stesc + 1) + 1;

Line 1283 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1301 roff_res(struct roff *r, struct buf *buf, int ln, int

free(buf->buf);

buf->buf = nbuf;

}

/* Search backwards for the next escape. */

stesc--;

continue;

}

Line 1311 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1332 roff_res(struct roff *r, struct buf *buf, int ln, int

term = '\0';

cp = stesc + 1;

switch (*cp) {

if (*cp == 'E')

cp++;

esct = cp;

switch (*esct) {

case '*':

case '$':

res = NULL;

Line 1327 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1351 roff_res(struct roff *r, struct buf *buf, int ln, int

res = ubuf;

break;

default:

esc = mandoc_escape(&cp, &stnam, &inaml);

err = MANDOCERR_OK;

if (esc == ESCAPE_ERROR ||

switch(mandoc_escape(&cp, &stnam, &inaml)) {

(esc == ESCAPE_SPECIAL &&

case ESCAPE_SPECIAL:

mchars_spec2cp(stnam, inaml) < 0))

if (mchars_spec2cp(stnam, inaml) >= 0)

mandoc_vmsg(MANDOCERR_ESC_BAD,

break;

r->parse, ln, (int)(stesc - buf->buf),

/* FALLTHROUGH */

case ESCAPE_ERROR:

err = MANDOCERR_ESC_BAD;

break;

case ESCAPE_UNDEF:

err = MANDOCERR_ESC_UNDEF;

break;

case ESCAPE_UNSUPP:

err = MANDOCERR_ESC_UNSUPP;

break;

default:

break;

}

if (err != MANDOCERR_OK)

mandoc_msg(err, ln, (int)(stesc - buf->buf),

"%.*s", (int)(cp - stesc), stesc);

stesc--;

continue;

}

if (EXPAND_LIMIT < ++expand_count) {

mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,

mandoc_msg(MANDOCERR_ROFFLOOP,

ln, (int)(stesc - buf->buf), NULL);

return ROFF_IGN;

}

Line 1380 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1418 roff_res(struct roff *r, struct buf *buf, int ln, int

arg_complete = 1;

while (maxl == 0 || naml < maxl) {

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

mandoc_msg(MANDOCERR_ESC_BAD, r->parse,

mandoc_msg(MANDOCERR_ESC_BAD, ln,

ln, (int)(stesc - buf->buf), stesc);

(int)(stesc - buf->buf), "%s", stesc);

arg_complete = 0;

break;

}

Line 1389 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1427 roff_res(struct roff *r, struct buf *buf, int ln, int

cp++;

break;

}

if (*cp++ != '\\' || stesc[1] != 'w') {

if (*cp++ != '\\' || *esct != 'w') {

naml++;

continue;

}

Line 1397 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1435 roff_res(struct roff *r, struct buf *buf, int ln, int

case ESCAPE_SPECIAL:

case ESCAPE_UNICODE:

case ESCAPE_NUMBERED:

case ESCAPE_UNDEF:

case ESCAPE_OVERSTRIKE:

naml++;

break;

Line 1410 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1449 roff_res(struct roff *r, struct buf *buf, int ln, int

* undefined, resume searching for escapes.

switch (stesc[1]) {

switch (*esct) {

case '*':

if (arg_complete) {

deftype = ROFFDEF_USER | ROFFDEF_PRE;

Line 1432 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1471 roff_res(struct roff *r, struct buf *buf, int ln, int

break;

case '$':

if (r->mstackpos < 0) {

mandoc_vmsg(MANDOCERR_ARG_UNDEF,

mandoc_msg(MANDOCERR_ARG_UNDEF, ln,

r->parse, ln, (int)(stesc - buf->buf),

(int)(stesc - buf->buf), "%.3s", stesc);

"%.3s", stesc);

break;

}

ctx = r->mstack + r->mstackpos;

npos = stesc[2] - '1';

npos = esct[1] - '1';

if (npos >= 0 && npos <= 8) {

res = npos < ctx->argc ?

ctx->argv[npos] : "";

break;

}

if (stesc[2] == '*')

if (esct[1] == '*')

quote_args = 0;

else if (stesc[2] == '@')

else if (esct[1] == '@')

quote_args = 1;

else {

mandoc_vmsg(MANDOCERR_ARG_NONUM,

mandoc_msg(MANDOCERR_ARG_NONUM, ln,

r->parse, ln, (int)(stesc - buf->buf),

(int)(stesc - buf->buf), "%.3s", stesc);

"%.3s", stesc);

break;

}

asz = 0;

Line 1509 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1546 roff_res(struct roff *r, struct buf *buf, int ln, int

}

if (res == NULL) {

if (stesc[1] == '*')

if (*esct == '*')

mandoc_vmsg(MANDOCERR_STR_UNDEF,

mandoc_msg(MANDOCERR_STR_UNDEF,

r->parse, ln, (int)(stesc - buf->buf),

ln, (int)(stesc - buf->buf),

"%.*s", (int)naml, stnam);

res = "";

} else if (buf->sz + strlen(res) > SHRT_MAX) {

mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,

mandoc_msg(MANDOCERR_ROFFLOOP,

ln, (int)(stesc - buf->buf), NULL);

return ROFF_IGN;

}

Line 1537 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1574 roff_res(struct roff *r, struct buf *buf, int ln, int

}

* Parse a quoted or unquoted roff-style request or macro argument.

* Return a pointer to the parsed argument, which is either the original

* pointer or advanced by one byte in case the argument is quoted.

* NUL-terminate the argument in place.

* Collapse pairs of quotes inside quoted arguments.

* Advance the argument pointer to the next argument,

* or to the NUL byte terminating the argument line.

char *

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

{

struct buf buf;

char *cp, *start;

int newesc, pairs, quoted, white;

/* Quoting can only start with a new word. */

start = *cpp;

quoted = 0;

if ('"' == *start) {

quoted = 1;

start++;

}

newesc = pairs = white = 0;

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

* Move the following text left

* after quoted quotes and after "\\" and "\t".

if (pairs)

cp[-pairs] = cp[0];

if ('\\' == cp[0]) {

* In copy mode, translate double to single

* backslashes and backslash-t to literal tabs.

switch (cp[1]) {

case 'a':

case 't':

cp[-pairs] = '\t';

pairs++;

cp++;

break;

case '\\':

newesc = 1;

cp[-pairs] = ASCII_ESC;

pairs++;

cp++;

break;

case ' ':

/* Skip escaped blanks. */

if (0 == quoted)

cp++;

break;

default:

break;

}

} else if (0 == quoted) {

if (' ' == cp[0]) {

/* Unescaped blanks end unquoted args. */

white = 1;

break;

}

} else if ('"' == cp[0]) {

if ('"' == cp[1]) {

/* Quoted quotes collapse. */

pairs++;

cp++;

} else {

/* Unquoted quotes end quoted args. */

quoted = 2;

break;

}

/* Quoted argument without a closing quote. */

if (1 == quoted)

mandoc_msg(MANDOCERR_ARG_QUOTE, ln, *pos, NULL);

/* NUL-terminate this argument and move to the next one. */

if (pairs)

cp[-pairs] = '\0';

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

*cp++ = '\0';

while (' ' == *cp)

cp++;

}

*pos += (int)(cp - start) + (quoted ? 1 : 0);

*cpp = cp;

if ('\0' == *cp && (white || ' ' == cp[-1]))

mandoc_msg(MANDOCERR_SPACE_EOL, ln, *pos, NULL);

start = mandoc_strdup(start);

if (newesc == 0)

return start;

buf.buf = start;

buf.sz = strlen(start) + 1;

buf.next = NULL;

if (roff_expand(r, &buf, ln, 0, ASCII_ESC) & ROFF_IGN) {

free(buf.buf);

buf.buf = mandoc_strdup("");

}

return buf.buf;

}

* Process text streams.

static int

Line 1630 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1779 roff_parseln(struct roff *r, int ln, struct buf *buf,

/* Expand some escape sequences. */

e = roff_res(r, buf, ln, pos);

e = roff_expand(r, buf, ln, pos, r->escape);

if ((e & ROFF_MASK) == ROFF_IGN)

return e;

assert(e == ROFF_CONT);

Line 1659 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1808 roff_parseln(struct roff *r, int ln, struct buf *buf,

}

if (r->tbl != NULL && (ctl == 0 || buf->buf[pos] == '\0')) {

tbl_read(r->tbl, ln, buf->buf, ppos);

roff_addtbl(r->man, r->tbl);

roff_addtbl(r->man, ln, r->tbl);

return e;

}

if ( ! ctl)

Line 1668 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1817 roff_parseln(struct roff *r, int ln, struct buf *buf,

/* Skip empty request lines. */

if (buf->buf[pos] == '"') {

mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,

mandoc_msg(MANDOCERR_COMMENT_BAD, ln, pos, NULL);

ln, pos, NULL);

return ROFF_IGN;

} else if (buf->buf[pos] == '\0')

return ROFF_IGN;

Line 1694 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1842 roff_parseln(struct roff *r, int ln, struct buf *buf,

if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS ||

t == ROFF_br || t == ROFF_ce || t == ROFF_rj || t == ROFF_sp)) {

mandoc_msg(MANDOCERR_TBLMACRO, r->parse,

mandoc_msg(MANDOCERR_TBLMACRO,

ln, pos, buf->buf + spos);

ln, pos, "%s", buf->buf + spos);

if (t != TOKEN_NONE)

return ROFF_IGN;

while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')

Line 1703 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1851 roff_parseln(struct roff *r, int ln, struct buf *buf,

while (buf->buf[pos] == ' ')

pos++;

tbl_read(r->tbl, ln, buf->buf, pos);

roff_addtbl(r->man, r->tbl);

roff_addtbl(r->man, ln, r->tbl);

return ROFF_IGN;

}

Line 1754 void

Line 1902 void

roff_endparse(struct roff *r)

{

if (r->last != NULL)

mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,

mandoc_msg(MANDOCERR_BLK_NOEND, r->last->line,

r->last->line, r->last->col,

r->last->col, "%s", roff_name[r->last->tok]);

roff_name[r->last->tok]);

if (r->eqn != NULL) {

mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,

mandoc_msg(MANDOCERR_BLK_NOEND,

r->eqn->node->line, r->eqn->node->pos, "EQ");

eqn_parse(r->eqn);

r->eqn = NULL;

}

if (r->tbl != NULL) {

mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,

tbl_end(r->tbl, 1);

r->tbl->line, r->tbl->pos, "TS");

tbl_end(r->tbl);

r->tbl = NULL;

}

Line 1829 roff_cblock(ROFF_ARGS)

Line 1974 roff_cblock(ROFF_ARGS)

if (r->last == NULL) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");

ln, ppos, "..");

return ROFF_IGN;

}

Line 1844 roff_cblock(ROFF_ARGS)

Line 1988 roff_cblock(ROFF_ARGS)

case ROFF_ig:

break;

default:

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");

ln, ppos, "..");

return ROFF_IGN;

}

if (buf->buf[pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

".. %s", buf->buf + pos);

roffnode_pop(r);

Line 1877 static int

Line 2020 static int

roff_ccond(struct roff *r, int ln, int ppos)

{

if (NULL == r->last) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");

ln, ppos, "\\}");

return 0;

}

Line 1889 roff_ccond(struct roff *r, int ln, int ppos)

Line 2031 roff_ccond(struct roff *r, int ln, int ppos)

case ROFF_while:

break;

default:

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");

ln, ppos, "\\}");

return 0;

}

if (r->last->endspan > -1) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");

ln, ppos, "\\}");

return 0;

}

Line 1940 roff_block(ROFF_ARGS)

Line 2080 roff_block(ROFF_ARGS)

deftype = ROFFDEF_USER;

name = roff_getstrn(r, iname, namesz, &deftype);

if (name == NULL) {

mandoc_vmsg(MANDOCERR_STR_UNDEF,

mandoc_msg(MANDOCERR_STR_UNDEF,

r->parse, ln, (int)(iname - buf->buf),

ln, (int)(iname - buf->buf),

"%.*s", (int)namesz, iname);

namesz = 0;

} else

Line 1950 roff_block(ROFF_ARGS)

Line 2090 roff_block(ROFF_ARGS)

name = iname;

if (namesz == 0 && tok != ROFF_ig) {

mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,

mandoc_msg(MANDOCERR_REQ_EMPTY,

ln, ppos, roff_name[tok]);

ln, ppos, "%s", roff_name[tok]);

return ROFF_IGN;

}

Line 2009 roff_block(ROFF_ARGS)

Line 2149 roff_block(ROFF_ARGS)

deftype = ROFFDEF_USER;

name = roff_getstrn(r, iname, namesz, &deftype);

if (name == NULL) {

mandoc_vmsg(MANDOCERR_STR_UNDEF,

mandoc_msg(MANDOCERR_STR_UNDEF,

r->parse, ln, (int)(iname - buf->buf),

ln, (int)(iname - buf->buf),

"%.*s", (int)namesz, iname);

namesz = 0;

} else

Line 2022 roff_block(ROFF_ARGS)

Line 2162 roff_block(ROFF_ARGS)

r->last->end = mandoc_strndup(name, namesz);

if (*cp != '\0')

mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,

mandoc_msg(MANDOCERR_ARG_EXCESS,

ln, pos, ".%s ... %s", roff_name[tok], cp);

return ROFF_IGN;

Line 2397 roff_evalcond(struct roff *r, int ln, char *v, int *po

Line 2537 roff_evalcond(struct roff *r, int ln, char *v, int *po

roff_getstrn(r, name, sz, &deftype);

istrue = !!deftype;

}

*pos = cp - v;

*pos = (name + sz) - v;

return istrue == wanttrue;

default:

break;

Line 2423 static int

Line 2563 static int

roff_insec(ROFF_ARGS)

{

mandoc_msg(MANDOCERR_REQ_INSEC, r->parse,

mandoc_msg(MANDOCERR_REQ_INSEC, ln, ppos, "%s", roff_name[tok]);

ln, ppos, roff_name[tok]);

return ROFF_IGN;

}

Line 2432 static int

Line 2571 static int

roff_unsupp(ROFF_ARGS)

{

mandoc_msg(MANDOCERR_REQ_UNSUPP, r->parse,

mandoc_msg(MANDOCERR_REQ_UNSUPP, ln, ppos, "%s", roff_name[tok]);

ln, ppos, roff_name[tok]);

return ROFF_IGN;

}

Line 2507 roff_cond(ROFF_ARGS)

Line 2645 roff_cond(ROFF_ARGS)

if (buf->buf[pos] == '\0')

mandoc_msg(MANDOCERR_COND_EMPTY, r->parse,

mandoc_msg(MANDOCERR_COND_EMPTY,

ln, ppos, roff_name[tok]);

ln, ppos, "%s", roff_name[tok]);

r->last->endspan = 1;

Line 2545 roff_ds(ROFF_ARGS)

Line 2683 roff_ds(ROFF_ARGS)

return ROFF_IGN;

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

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

switch (name[namesz]) {

case '\\':

return ROFF_IGN;

case '\t':

string = buf->buf + pos + namesz;

break;

default:

break;

}

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

if (*string == '"')

Line 2711 roff_evalnum(struct roff *r, int ln, const char *v,

Line 2856 roff_evalnum(struct roff *r, int ln, const char *v,

case '/':

if (operand2 == 0) {

mandoc_msg(MANDOCERR_DIVZERO,

r->parse, ln, *pos, v);

ln, *pos, "%s", v);

*res = 0;

break;

}

Line 2720 roff_evalnum(struct roff *r, int ln, const char *v,

Line 2865 roff_evalnum(struct roff *r, int ln, const char *v,

case '%':

if (operand2 == 0) {

mandoc_msg(MANDOCERR_DIVZERO,

r->parse, ln, *pos, v);

ln, *pos, "%s", v);

*res = 0;

break;

}

Line 2922 roff_nr(ROFF_ARGS)

Line 3067 roff_nr(ROFF_ARGS)

return ROFF_IGN;

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

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

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

return ROFF_IGN;

sign = *val;

Line 2986 roff_rm(ROFF_ARGS)

Line 3131 roff_rm(ROFF_ARGS)

namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));

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

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

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

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

break;

}

return ROFF_IGN;

Line 3000 roff_it(ROFF_ARGS)

Line 3145 roff_it(ROFF_ARGS)

/* Parse the number of lines. */

if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {

mandoc_msg(MANDOCERR_IT_NONUM, r->parse,

mandoc_msg(MANDOCERR_IT_NONUM,

ln, ppos, buf->buf + 1);

ln, ppos, "%s", buf->buf + 1);

return ROFF_IGN;

}

Line 3054 roff_Dd(ROFF_ARGS)

Line 3199 roff_Dd(ROFF_ARGS)

static int

roff_TE(ROFF_ARGS)

{

r->man->flags &= ~ROFF_NONOFILL;

if (r->tbl == NULL) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "TE");

ln, ppos, "TE");

return ROFF_IGN;

}

if (tbl_end(r->tbl) == 0) {

if (tbl_end(r->tbl, 0) == 0) {

r->tbl = NULL;

free(buf->buf);

buf->buf = mandoc_strdup(".sp");

Line 3076 roff_T_(ROFF_ARGS)

Line 3221 roff_T_(ROFF_ARGS)

{

if (NULL == r->tbl)

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "T&");

ln, ppos, "T&");

else

tbl_restart(ln, ppos, r->tbl);

Line 3155 roff_EQ(ROFF_ARGS)

Line 3299 roff_EQ(ROFF_ARGS)

{

struct roff_node *n;

if (r->man->macroset == MACROSET_MAN)

if (r->man->meta.macroset == MACROSET_MAN)

man_breakscope(r->man, ROFF_EQ);

n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE);

if (ln > r->man->last->line)

n->flags |= NODE_LINE;

n->eqn = mandoc_calloc(1, sizeof(*n->eqn));

n->eqn = eqn_box_new();

n->eqn->expectargs = UINT_MAX;

roff_node_append(r->man, n);

r->man->next = ROFF_NEXT_SIBLING;

assert(r->eqn == NULL);

if (r->last_eqn == NULL)

r->last_eqn = eqn_alloc(r->parse);

r->last_eqn = eqn_alloc();

else

eqn_reset(r->last_eqn);

r->eqn = r->last_eqn;

r->eqn->node = n;

if (buf->buf[pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

".EQ %s", buf->buf + pos);

return ROFF_IGN;

Line 3187 roff_EN(ROFF_ARGS)

Line 3330 roff_EN(ROFF_ARGS)

eqn_parse(r->eqn);

r->eqn = NULL;

} else

mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "EN");

if (buf->buf[pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

"EN %s", buf->buf + pos);

return ROFF_IGN;

}

Line 3198 static int

Line 3341 static int

roff_TS(ROFF_ARGS)

{

if (r->tbl != NULL) {

mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse,

mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");

ln, ppos, "TS breaks TS");

tbl_end(r->tbl, 0);

tbl_end(r->tbl);

}

r->tbl = tbl_alloc(ppos, ln, r->parse);

r->man->flags |= ROFF_NONOFILL;

if (r->last_tbl)

r->tbl = tbl_alloc(ppos, ln, r->last_tbl);

r->last_tbl->next = r->tbl;

if (r->last_tbl == NULL)

else

r->first_tbl = r->tbl;

r->last_tbl = r->tbl;

return ROFF_IGN;

}

static int

roff_noarg(ROFF_ARGS)

{

if (r->man->flags & (MAN_BLINE | MAN_ELINE))

man_breakscope(r->man, tok);

if (tok == ROFF_brp)

tok = ROFF_br;

roff_elem_alloc(r->man, ln, ppos, tok);

if (buf->buf[pos] != '\0')

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

"%s %s", roff_name[tok], buf->buf + pos);

if (tok == ROFF_nf)

r->man->flags |= ROFF_NOFILL;

else if (tok == ROFF_fi)

r->man->flags &= ~ROFF_NOFILL;

r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;

r->man->next = ROFF_NEXT_SIBLING;

return ROFF_IGN;

}

static int

roff_onearg(ROFF_ARGS)

{

struct roff_node *n;

Line 3238 roff_onearg(ROFF_ARGS)

Line 3399 roff_onearg(ROFF_ARGS)

while (*cp == ' ')

*cp++ = '\0';

if (*cp != '\0')

mandoc_vmsg(MANDOCERR_ARG_EXCESS,

mandoc_msg(MANDOCERR_ARG_EXCESS,

r->parse, ln, cp - buf->buf,

ln, (int)(cp - buf->buf),

"%s ... %s", roff_name[tok], cp);

roff_word_alloc(r->man, ln, pos, buf->buf + pos);

}

Line 3252 roff_onearg(ROFF_ARGS)

Line 3413 roff_onearg(ROFF_ARGS)

npos = 0;

if (roff_evalnum(r, ln, r->man->last->string, &npos,

&roffce_lines, 0) == 0) {

mandoc_vmsg(MANDOCERR_CE_NONUM,

mandoc_msg(MANDOCERR_CE_NONUM,

r->parse, ln, pos, "ce %s", buf->buf + pos);

ln, pos, "ce %s", buf->buf + pos);

roffce_lines = 1;

}

if (roffce_lines < 1) {

Line 3305 roff_als(ROFF_ARGS)

Line 3466 roff_als(ROFF_ARGS)

return ROFF_IGN;

newsz = roff_getname(r, &oldn, ln, pos);

if (newn[newsz] == '\\' || *oldn == '\0')

if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')

return ROFF_IGN;

end = oldn;

Line 3322 roff_als(ROFF_ARGS)

Line 3483 roff_als(ROFF_ARGS)

}

static int

roff_br(ROFF_ARGS)

{

if (r->man->flags & (MAN_BLINE | MAN_ELINE))

man_breakscope(r->man, ROFF_br);

roff_elem_alloc(r->man, ln, ppos, ROFF_br);

if (buf->buf[pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,

"%s %s", roff_name[tok], buf->buf + pos);

r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;

r->man->next = ROFF_NEXT_SIBLING;

return ROFF_IGN;

}

static int

roff_cc(ROFF_ARGS)

{

const char *p;

Line 3346 roff_cc(ROFF_ARGS)

Line 3493 roff_cc(ROFF_ARGS)

r->control = '\0';

if (*p != '\0')

mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,

mandoc_msg(MANDOCERR_ARG_EXCESS,

ln, p - buf->buf, "cc ... %s", p);

return ROFF_IGN;

Line 3366 roff_char(ROFF_ARGS)

Line 3513 roff_char(ROFF_ARGS)

if (*kp == '\0' || (*kp == '\\' &&

mandoc_escape(&p, NULL, NULL) != ESCAPE_SPECIAL) ||

(*p != ' ' && *p != '\0')) {

mandoc_vmsg(MANDOCERR_CHAR_ARG, r->parse,

mandoc_msg(MANDOCERR_CHAR_ARG, ln, pos, "char %s", kp);

ln, pos, "char %s", kp);

return ROFF_IGN;

}

ksz = p - kp;

Line 3400 roff_char(ROFF_ARGS)

Line 3546 roff_char(ROFF_ARGS)

}

if (font > 1)

mandoc_msg(MANDOCERR_CHAR_FONT, r->parse,

mandoc_msg(MANDOCERR_CHAR_FONT,

ln, vp - buf->buf, vp);

ln, (int)(vp - buf->buf), "%s", vp);

* Approximate the effect of .char using the .tr tables.

Line 3434 roff_ec(ROFF_ARGS)

Line 3580 roff_ec(ROFF_ARGS)

else {

r->escape = *p;

if (*++p != '\0')

mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,

mandoc_msg(MANDOCERR_ARG_EXCESS, ln,

ln, p - buf->buf, "ec ... %s", p);

(int)(p - buf->buf), "ec ... %s", p);

}

return ROFF_IGN;

}

Line 3445 roff_eo(ROFF_ARGS)

Line 3591 roff_eo(ROFF_ARGS)

{

r->escape = '\0';

if (buf->buf[pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse,

mandoc_msg(MANDOCERR_ARG_SKIP,

ln, pos, "eo %s", buf->buf + pos);

return ROFF_IGN;

}

Line 3469 roff_tr(ROFF_ARGS)

Line 3615 roff_tr(ROFF_ARGS)

p = buf->buf + pos;

if (*p == '\0') {

mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, ln, ppos, "tr");

mandoc_msg(MANDOCERR_REQ_EMPTY, ln, ppos, "tr");

return ROFF_IGN;

}

Line 3480 roff_tr(ROFF_ARGS)

Line 3626 roff_tr(ROFF_ARGS)

if (*first == '\\') {

esc = mandoc_escape(&p, NULL, NULL);

if (esc == ESCAPE_ERROR) {

mandoc_msg(MANDOCERR_ESC_BAD, r->parse,

mandoc_msg(MANDOCERR_ESC_BAD, ln,

ln, (int)(p - buf->buf), first);

(int)(p - buf->buf), "%s", first);

return ROFF_IGN;

}

fsz = (size_t)(p - first);

Line 3491 roff_tr(ROFF_ARGS)

Line 3637 roff_tr(ROFF_ARGS)

if (*second == '\\') {

esc = mandoc_escape(&p, NULL, NULL);

if (esc == ESCAPE_ERROR) {

mandoc_msg(MANDOCERR_ESC_BAD, r->parse,

mandoc_msg(MANDOCERR_ESC_BAD, ln,

ln, (int)(p - buf->buf), second);

(int)(p - buf->buf), "%s", second);

return ROFF_IGN;

}

ssz = (size_t)(p - second);

} else if (*second == '\0') {

mandoc_vmsg(MANDOCERR_TR_ODD, r->parse,

mandoc_msg(MANDOCERR_TR_ODD, ln,

ln, first - buf->buf, "tr %s", first);

(int)(first - buf->buf), "tr %s", first);

second = " ";

p--;

}

Line 3533 roff_return(ROFF_ARGS)

Line 3679 roff_return(ROFF_ARGS)

if (r->mstackpos >= 0)

return ROFF_IGN | ROFF_USERRET;

mandoc_msg(MANDOCERR_REQ_NOMAC, r->parse, ln, ppos, "return");

mandoc_msg(MANDOCERR_REQ_NOMAC, ln, ppos, "return");

return ROFF_IGN;

}

Line 3550 roff_rn(ROFF_ARGS)

Line 3696 roff_rn(ROFF_ARGS)

return ROFF_IGN;

oldsz = roff_getname(r, &newn, ln, pos);

if (oldn[oldsz] == '\\' || *newn == '\0')

if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')

return ROFF_IGN;

end = newn;

Line 3596 roff_shift(ROFF_ARGS)

Line 3742 roff_shift(ROFF_ARGS)

levels = 1;

if (buf->buf[pos] != '\0' &&

roff_evalnum(r, ln, buf->buf, &pos, &levels, 0) == 0) {

mandoc_vmsg(MANDOCERR_CE_NONUM, r->parse,

mandoc_msg(MANDOCERR_CE_NONUM,

ln, pos, "shift %s", buf->buf + pos);

levels = 1;

}

if (r->mstackpos < 0) {

mandoc_msg(MANDOCERR_REQ_NOMAC, r->parse, ln, ppos, "shift");

mandoc_msg(MANDOCERR_REQ_NOMAC, ln, ppos, "shift");

return ROFF_IGN;

}

ctx = r->mstack + r->mstackpos;

if (levels > ctx->argc) {

mandoc_vmsg(MANDOCERR_SHIFT, r->parse,

mandoc_msg(MANDOCERR_SHIFT,

ln, pos, "%d, but max is %d", levels, ctx->argc);

levels = ctx->argc;

}

Line 3626 roff_so(ROFF_ARGS)

Line 3772 roff_so(ROFF_ARGS)

char *name, *cp;

name = buf->buf + pos;

mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, "so %s", name);

mandoc_msg(MANDOCERR_SO, ln, ppos, "so %s", name);

* Handle `so'. Be EXTREMELY careful, as we shouldn't be

Line 3636 roff_so(ROFF_ARGS)

Line 3782 roff_so(ROFF_ARGS)

if (*name == '/' || strstr(name, "../") || strstr(name, "/..")) {

mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos,

mandoc_msg(MANDOCERR_SO_PATH, ln, ppos, ".so %s", name);

".so %s", name);

buf->sz = mandoc_asprintf(&cp,

".sp\nSee the file %s.\n.sp", name) + 1;

free(buf->buf);

Line 3683 roff_userdef(ROFF_ARGS)

Line 3828 roff_userdef(ROFF_ARGS)

ctx->argv = mandoc_reallocarray(ctx->argv,

ctx->argsz, sizeof(*ctx->argv));

}

arg = mandoc_getarg(r->parse, &src, ln, &pos);

arg = roff_getarg(r, &src, ln, &pos);

sz = 1; /* For the terminating NUL. */

for (ap = arg; *ap != '\0'; ap++)

sz += *ap == '"' ? 4 : 1;

Line 3696 roff_userdef(ROFF_ARGS)

Line 3841 roff_userdef(ROFF_ARGS)

*dst++ = *ap;

}

*dst = '\0';

free(arg);

}

/* Replace the macro invocation by the macro definition. */

Line 3726 roff_renamed(ROFF_ARGS)

Line 3872 roff_renamed(ROFF_ARGS)

return ROFF_CONT;

}

* Measure the length in bytes of the roff identifier at *cpp

* and advance the pointer to the next word.

static size_t

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

{

Line 3733 roff_getname(struct roff *r, char **cpp, int ln, int p

Line 3883 roff_getname(struct roff *r, char **cpp, int ln, int p

size_t namesz;

name = *cpp;

if ('\0' == *name)

if (*name == '\0')

return 0;

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

/* Advance cp to the byte after the end of the name. */

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

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

namesz = cp - name;

if (*cp == '\0')

break;

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

cp++;

break;

}

if ('\\' != *cp)

if (*cp != '\\')

continue;

namesz = cp - name;

if (cp[1] == '{' || cp[1] == '}')

if ('{' == cp[1] || '}' == cp[1])

break;

cp++;

if (*++cp == '\\')

if ('\\' == *cp)

continue;

mandoc_vmsg(MANDOCERR_NAMESC, r->parse, ln, pos,

mandoc_msg(MANDOCERR_NAMESC, ln, pos,

"%.*s", (int)(cp - name + 1), name);

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

break;

}

/* Read past spaces. */

while (' ' == *cp)

while (*cp == ' ')

cp++;

*cpp = cp;

Line 3900 roff_getstrn(struct roff *r, const char *name, size_t

Line 4053 roff_getstrn(struct roff *r, const char *name, size_t

break;

}

if (r->man->macroset != MACROSET_MAN) {

if (r->man->meta.macroset != MACROSET_MAN) {

for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) {

if (strncmp(name, roff_name[tok], len) != 0 ||

roff_name[tok][len] != '\0')

Line 3914 roff_getstrn(struct roff *r, const char *name, size_t

Line 4067 roff_getstrn(struct roff *r, const char *name, size_t

}

if (r->man->macroset != MACROSET_MDOC) {

if (r->man->meta.macroset != MACROSET_MDOC) {

for (tok = MAN_TH; tok < MAN_MAX; tok++) {

if (strncmp(name, roff_name[tok], len) != 0 ||

roff_name[tok][len] != '\0')

Line 4045 roff_strdup(const struct roff *r, const char *p)

Line 4198 roff_strdup(const struct roff *r, const char *p)

* We bail out on bad escapes.

* No need to warn: we already did so when

* roff_res() was called.

* roff_expand() was called.

sz = (int)(p - pp);

res = mandoc_realloc(res, ssz + sz + 1);

CVSweb