version 1.312, 2017/06/14 22:51:25 |
version 1.317, 2017/06/25 11:42:02 |
|
|
/* Maximum number of string expansions per line, to break infinite loops. */ |
/* Maximum number of string expansions per line, to break infinite loops. */ |
#define EXPAND_LIMIT 1000 |
#define EXPAND_LIMIT 1000 |
|
|
|
/* Types of definitions of macros and strings. */ |
|
#define ROFFDEF_USER (1 << 1) /* User-defined. */ |
|
#define ROFFDEF_PRE (1 << 2) /* Predefined. */ |
|
#define ROFFDEF_REN (1 << 3) /* Renamed standard macro. */ |
|
#define ROFFDEF_STD (1 << 4) /* mdoc(7) or man(7) macro. */ |
|
#define ROFFDEF_ANY (ROFFDEF_USER | ROFFDEF_PRE | \ |
|
ROFFDEF_REN | ROFFDEF_STD) |
|
|
/* --- data types --------------------------------------------------------- */ |
/* --- data types --------------------------------------------------------- */ |
|
|
/* |
/* |
Line 177 static int roff_getregn(const struct roff *, |
|
Line 185 static int roff_getregn(const struct roff *, |
|
const char *, size_t); |
const char *, size_t); |
static int roff_getregro(const struct roff *, |
static int roff_getregro(const struct roff *, |
const char *name); |
const char *name); |
static const char *roff_getrenn(const struct roff *, |
|
const char *, size_t); |
|
static const char *roff_getstrn(const struct roff *, |
static const char *roff_getstrn(const struct roff *, |
const char *, size_t); |
const char *, size_t, int *); |
static int roff_hasregn(const struct roff *, |
static int roff_hasregn(const struct roff *, |
const char *, size_t); |
const char *, size_t); |
static enum rofferr roff_insec(ROFF_ARGS); |
static enum rofferr roff_insec(ROFF_ARGS); |
Line 207 static void roff_setstrn(struct roffkv **, const cha |
|
Line 213 static void roff_setstrn(struct roffkv **, const cha |
|
static enum rofferr roff_so(ROFF_ARGS); |
static enum rofferr roff_so(ROFF_ARGS); |
static enum rofferr roff_tr(ROFF_ARGS); |
static enum rofferr roff_tr(ROFF_ARGS); |
static enum rofferr roff_Dd(ROFF_ARGS); |
static enum rofferr roff_Dd(ROFF_ARGS); |
static enum rofferr roff_TH(ROFF_ARGS); |
|
static enum rofferr roff_TE(ROFF_ARGS); |
static enum rofferr roff_TE(ROFF_ARGS); |
static enum rofferr roff_TS(ROFF_ARGS); |
static enum rofferr roff_TS(ROFF_ARGS); |
static enum rofferr roff_EQ(ROFF_ARGS); |
static enum rofferr roff_EQ(ROFF_ARGS); |
Line 325 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 330 const char *__roff_name[MAN_MAX + 1] = { |
|
"RE", "RS", "DT", "UC", |
"RE", "RS", "DT", "UC", |
"PD", "AT", "in", |
"PD", "AT", "in", |
"OP", "EX", "EE", "UR", |
"OP", "EX", "EE", "UR", |
"UE", NULL |
"UE", "MT", "ME", NULL |
}; |
}; |
const char *const *roff_name = __roff_name; |
const char *const *roff_name = __roff_name; |
|
|
Line 536 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 541 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_T_, NULL, NULL, 0 }, /* T& */ |
{ roff_T_, NULL, NULL, 0 }, /* T& */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tc */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tc */ |
{ roff_TE, NULL, NULL, 0 }, /* TE */ |
{ roff_TE, NULL, NULL, 0 }, /* TE */ |
{ roff_TH, NULL, NULL, 0 }, /* TH */ |
{ roff_Dd, NULL, NULL, 0 }, /* TH */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tkf */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tkf */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tl */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tl */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tm */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tm */ |
Line 574 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 579 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_userdef, NULL, NULL, 0 } |
{ roff_userdef, NULL, NULL, 0 } |
}; |
}; |
|
|
/* not currently implemented: Ds em Eq LP Me PP pp Or Rd Sf SH */ |
|
const char *const __mdoc_reserved[] = { |
|
"Ac", "Ad", "An", "Ao", "Ap", "Aq", "Ar", "At", |
|
"Bc", "Bd", "Bf", "Bk", "Bl", "Bo", "Bq", |
|
"Brc", "Bro", "Brq", "Bsx", "Bt", "Bx", |
|
"Cd", "Cm", "Db", "Dc", "Dd", "Dl", "Do", "Dq", |
|
"Dt", "Dv", "Dx", "D1", |
|
"Ec", "Ed", "Ef", "Ek", "El", "Em", |
|
"En", "Eo", "Er", "Es", "Ev", "Ex", |
|
"Fa", "Fc", "Fd", "Fl", "Fn", "Fo", "Fr", "Ft", "Fx", |
|
"Hf", "Ic", "In", "It", "Lb", "Li", "Lk", "Lp", |
|
"Ms", "Mt", "Nd", "Nm", "No", "Ns", "Nx", |
|
"Oc", "Oo", "Op", "Os", "Ot", "Ox", |
|
"Pa", "Pc", "Pf", "Po", "Pp", "Pq", |
|
"Qc", "Ql", "Qo", "Qq", "Re", "Rs", "Rv", |
|
"Sc", "Sh", "Sm", "So", "Sq", |
|
"Ss", "St", "Sx", "Sy", |
|
"Ta", "Tn", "Ud", "Ux", "Va", "Vt", "Xc", "Xo", "Xr", |
|
"%A", "%B", "%C", "%D", "%I", "%J", "%N", "%O", |
|
"%P", "%Q", "%R", "%T", "%U", "%V", |
|
NULL |
|
}; |
|
|
|
/* not currently implemented: BT DE DS ME MT PT SY TQ YS */ |
|
const char *const __man_reserved[] = { |
|
"AT", "B", "BI", "BR", "DT", |
|
"EE", "EN", "EQ", "EX", "HP", "I", "IB", "IP", "IR", |
|
"LP", "OP", "P", "PD", "PP", |
|
"R", "RB", "RE", "RI", "RS", "SB", "SH", "SM", "SS", |
|
"TE", "TH", "TP", "TS", "T&", "UC", "UE", "UR", |
|
NULL |
|
}; |
|
|
|
/* Array of injected predefined strings. */ |
/* Array of injected predefined strings. */ |
#define PREDEFS_MAX 38 |
#define PREDEFS_MAX 38 |
static const struct predef predefs[PREDEFS_MAX] = { |
static const struct predef predefs[PREDEFS_MAX] = { |
Line 847 roff_man_free(struct roff_man *man) |
|
Line 819 roff_man_free(struct roff_man *man) |
|
|
|
struct roff_man * |
struct roff_man * |
roff_man_alloc(struct roff *roff, struct mparse *parse, |
roff_man_alloc(struct roff *roff, struct mparse *parse, |
const char *defos, int quick) |
const char *os_s, int quick) |
{ |
{ |
struct roff_man *man; |
struct roff_man *man; |
|
|
man = mandoc_calloc(1, sizeof(*man)); |
man = mandoc_calloc(1, sizeof(*man)); |
man->parse = parse; |
man->parse = parse; |
man->roff = roff; |
man->roff = roff; |
man->defos = defos; |
man->os_s = os_s; |
man->quick = quick; |
man->quick = quick; |
roff_man_alloc1(man); |
roff_man_alloc1(man); |
roff->man = man; |
roff->man = man; |
Line 1166 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1138 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
size_t maxl; /* expected length of the escape name */ |
size_t maxl; /* expected length of the escape name */ |
size_t naml; /* actual length of the escape name */ |
size_t naml; /* actual length of the escape name */ |
enum mandoc_esc esc; /* type of the escape sequence */ |
enum mandoc_esc esc; /* type of the escape sequence */ |
|
enum mandoc_os os_e; /* kind of RCS id seen */ |
int inaml; /* length returned from mandoc_escape() */ |
int inaml; /* length returned from mandoc_escape() */ |
int expand_count; /* to avoid infinite loops */ |
int expand_count; /* to avoid infinite loops */ |
int npos; /* position in numeric expression */ |
int npos; /* position in numeric expression */ |
int arg_complete; /* argument not interrupted by eol */ |
int arg_complete; /* argument not interrupted by eol */ |
int done; /* no more input available */ |
int done; /* no more input available */ |
|
int deftype; /* type of definition to paste */ |
char term; /* character terminating the escape */ |
char term; /* character terminating the escape */ |
|
|
/* Search forward for comments. */ |
/* Search forward for comments. */ |
Line 1183 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1157 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
stesc++; |
stesc++; |
if (*stesc != '"' && *stesc != '#') |
if (*stesc != '"' && *stesc != '#') |
continue; |
continue; |
|
|
|
/* Comment found, look for RCS id. */ |
|
|
|
if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) { |
|
os_e = MANDOC_OS_OPENBSD; |
|
cp += 8; |
|
} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) { |
|
os_e = MANDOC_OS_NETBSD; |
|
cp += 7; |
|
} |
|
if (cp != NULL && |
|
isalnum((unsigned char)*cp) == 0 && |
|
strchr(cp, '$') != NULL) { |
|
if (r->man->meta.rcsids & (1 << os_e)) |
|
mandoc_msg(MANDOCERR_RCS_REP, r->parse, |
|
ln, stesc + 1 - buf->buf, stesc + 1); |
|
r->man->meta.rcsids |= 1 << os_e; |
|
} |
|
|
|
/* Handle trailing whitespace. */ |
|
|
cp = strchr(stesc--, '\0') - 1; |
cp = strchr(stesc--, '\0') - 1; |
if (*cp == '\n') { |
if (*cp == '\n') { |
done = 1; |
done = 1; |
Line 1347 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1342 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
|
|
switch (stesc[1]) { |
switch (stesc[1]) { |
case '*': |
case '*': |
if (arg_complete) |
if (arg_complete) { |
res = roff_getstrn(r, stnam, naml); |
deftype = ROFFDEF_USER | ROFFDEF_PRE; |
|
res = roff_getstrn(r, stnam, naml, &deftype); |
|
} |
break; |
break; |
case 'B': |
case 'B': |
npos = 0; |
npos = 0; |
Line 1617 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
Line 1614 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
char *cp; |
char *cp; |
const char *mac; |
const char *mac; |
size_t maclen; |
size_t maclen; |
|
int deftype; |
enum roff_tok t; |
enum roff_tok t; |
|
|
cp = buf + *pos; |
cp = buf + *pos; |
Line 1627 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
Line 1625 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
mac = cp; |
mac = cp; |
maclen = roff_getname(r, &cp, ln, ppos); |
maclen = roff_getname(r, &cp, ln, ppos); |
|
|
t = (r->current_string = roff_getstrn(r, mac, maclen)) ? |
deftype = ROFFDEF_USER | ROFFDEF_REN; |
ROFF_USERDEF : |
r->current_string = roff_getstrn(r, mac, maclen, &deftype); |
(r->current_string = roff_getrenn(r, mac, maclen)) ? |
switch (deftype) { |
ROFF_RENAMED : roffhash_find(r->reqtab, mac, maclen); |
case ROFFDEF_USER: |
|
t = ROFF_USERDEF; |
|
break; |
|
case ROFFDEF_REN: |
|
t = ROFF_RENAMED; |
|
break; |
|
default: |
|
t = roffhash_find(r->reqtab, mac, maclen); |
|
break; |
|
} |
if (t != TOKEN_NONE) |
if (t != TOKEN_NONE) |
*pos = cp - buf; |
*pos = cp - buf; |
|
|
return t; |
return t; |
} |
} |
|
|
Line 1726 roff_ccond(struct roff *r, int ln, int ppos) |
|
Line 1731 roff_ccond(struct roff *r, int ln, int ppos) |
|
static enum rofferr |
static enum rofferr |
roff_block(ROFF_ARGS) |
roff_block(ROFF_ARGS) |
{ |
{ |
const char *name; |
const char *name, *value; |
char *iname, *cp; |
char *call, *cp, *iname, *rname; |
size_t namesz; |
size_t csz, namesz, rsz; |
|
int deftype; |
|
|
/* Ignore groff compatibility mode for now. */ |
/* Ignore groff compatibility mode for now. */ |
|
|
Line 1756 roff_block(ROFF_ARGS) |
|
Line 1762 roff_block(ROFF_ARGS) |
|
/* Resolve the macro name argument if it is indirect. */ |
/* Resolve the macro name argument if it is indirect. */ |
|
|
if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) { |
if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) { |
if ((name = roff_getstrn(r, iname, namesz)) == NULL) { |
deftype = ROFFDEF_USER; |
|
name = roff_getstrn(r, iname, namesz, &deftype); |
|
if (name == NULL) { |
mandoc_vmsg(MANDOCERR_STR_UNDEF, |
mandoc_vmsg(MANDOCERR_STR_UNDEF, |
r->parse, ln, (int)(iname - buf->buf), |
r->parse, ln, (int)(iname - buf->buf), |
"%.*s", (int)namesz, iname); |
"%.*s", (int)namesz, iname); |
Line 1783 roff_block(ROFF_ARGS) |
|
Line 1791 roff_block(ROFF_ARGS) |
|
if (tok == ROFF_de || tok == ROFF_dei) { |
if (tok == ROFF_de || tok == ROFF_dei) { |
roff_setstrn(&r->strtab, name, namesz, "", 0, 0); |
roff_setstrn(&r->strtab, name, namesz, "", 0, 0); |
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
|
} else if (tok == ROFF_am || tok == ROFF_ami) { |
|
deftype = ROFFDEF_ANY; |
|
value = roff_getstrn(r, iname, namesz, &deftype); |
|
switch (deftype) { /* Before appending, ... */ |
|
case ROFFDEF_PRE: /* copy predefined to user-defined. */ |
|
roff_setstrn(&r->strtab, name, namesz, |
|
value, strlen(value), 0); |
|
break; |
|
case ROFFDEF_REN: /* call original standard macro. */ |
|
csz = mandoc_asprintf(&call, ".%.*s \\$* \\\"\n", |
|
(int)strlen(value), value); |
|
roff_setstrn(&r->strtab, name, namesz, call, csz, 0); |
|
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
|
free(call); |
|
break; |
|
case ROFFDEF_STD: /* rename and call standard macro. */ |
|
rsz = mandoc_asprintf(&rname, "__%s_renamed", name); |
|
roff_setstrn(&r->rentab, rname, rsz, name, namesz, 0); |
|
csz = mandoc_asprintf(&call, ".%.*s \\$* \\\"\n", |
|
(int)rsz, rname); |
|
roff_setstrn(&r->strtab, name, namesz, call, csz, 0); |
|
free(call); |
|
free(rname); |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
|
|
if (*cp == '\0') |
if (*cp == '\0') |
Line 1796 roff_block(ROFF_ARGS) |
|
Line 1831 roff_block(ROFF_ARGS) |
|
/* Resolve the end marker if it is indirect. */ |
/* Resolve the end marker if it is indirect. */ |
|
|
if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) { |
if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) { |
if ((name = roff_getstrn(r, iname, namesz)) == NULL) { |
deftype = ROFFDEF_USER; |
|
name = roff_getstrn(r, iname, namesz, &deftype); |
|
if (name == NULL) { |
mandoc_vmsg(MANDOCERR_STR_UNDEF, |
mandoc_vmsg(MANDOCERR_STR_UNDEF, |
r->parse, ln, (int)(iname - buf->buf), |
r->parse, ln, (int)(iname - buf->buf), |
"%.*s", (int)namesz, iname); |
"%.*s", (int)namesz, iname); |
Line 2068 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
Line 2105 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
{ |
{ |
char *cp, *name; |
char *cp, *name; |
size_t sz; |
size_t sz; |
int number, savepos, istrue, wanttrue; |
int deftype, number, savepos, istrue, wanttrue; |
|
|
if ('!' == v[*pos]) { |
if ('!' == v[*pos]) { |
wanttrue = 0; |
wanttrue = 0; |
Line 2096 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
Line 2133 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
cp++; |
cp++; |
name = cp; |
name = cp; |
sz = roff_getname(r, &cp, ln, cp - v); |
sz = roff_getname(r, &cp, ln, cp - v); |
istrue = sz && (v[*pos] == 'r' ? roff_hasregn(r, name, sz) : |
if (sz == 0) |
(roff_getstrn(r, name, sz) != NULL || |
istrue = 0; |
roff_getrenn(r, name, sz) != NULL)); |
else if (v[*pos] == 'r') |
|
istrue = roff_hasregn(r, name, sz); |
|
else { |
|
deftype = ROFFDEF_ANY; |
|
roff_getstrn(r, name, sz, &deftype); |
|
istrue = !!deftype; |
|
} |
*pos = cp - v; |
*pos = cp - v; |
return istrue == wanttrue; |
return istrue == wanttrue; |
default: |
default: |
Line 2703 roff_it(ROFF_ARGS) |
|
Line 2746 roff_it(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_Dd(ROFF_ARGS) |
roff_Dd(ROFF_ARGS) |
{ |
{ |
const char *const *cp; |
int mask; |
|
enum roff_tok t, te; |
|
|
if ((r->options & (MPARSE_MDOC | MPARSE_QUICK)) == 0) |
switch (tok) { |
for (cp = __mdoc_reserved; *cp; cp++) |
case ROFF_Dd: |
roff_setstr(r, *cp, NULL, 0); |
tok = MDOC_Dd; |
|
te = MDOC_MAX; |
if (r->format == 0) |
if (r->format == 0) |
r->format = MPARSE_MDOC; |
r->format = MPARSE_MDOC; |
|
mask = MPARSE_MDOC | MPARSE_QUICK; |
|
break; |
|
case ROFF_TH: |
|
tok = MAN_TH; |
|
te = MAN_MAX; |
|
if (r->format == 0) |
|
r->format = MPARSE_MAN; |
|
mask = MPARSE_QUICK; |
|
break; |
|
default: |
|
abort(); |
|
} |
|
if ((r->options & mask) == 0) |
|
for (t = tok; t < te; t++) |
|
roff_setstr(r, roff_name[t], NULL, 0); |
return ROFF_CONT; |
return ROFF_CONT; |
} |
} |
|
|
static enum rofferr |
static enum rofferr |
roff_TH(ROFF_ARGS) |
|
{ |
|
const char *const *cp; |
|
|
|
if ((r->options & MPARSE_QUICK) == 0) |
|
for (cp = __man_reserved; *cp; cp++) |
|
roff_setstr(r, *cp, NULL, 0); |
|
|
|
if (r->format == 0) |
|
r->format = MPARSE_MAN; |
|
|
|
return ROFF_CONT; |
|
} |
|
|
|
static enum rofferr |
|
roff_TE(ROFF_ARGS) |
roff_TE(ROFF_ARGS) |
{ |
{ |
|
|
Line 2981 roff_als(ROFF_ARGS) |
|
Line 3024 roff_als(ROFF_ARGS) |
|
if (oldsz == 0) |
if (oldsz == 0) |
return ROFF_IGN; |
return ROFF_IGN; |
|
|
valsz = mandoc_asprintf(&value, ".%.*s \\$*\n", (int)oldsz, oldn); |
valsz = mandoc_asprintf(&value, ".%.*s \\$*\\\"\n", |
|
(int)oldsz, oldn); |
roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0); |
roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
free(value); |
free(value); |
Line 3114 roff_rn(ROFF_ARGS) |
|
Line 3158 roff_rn(ROFF_ARGS) |
|
const char *value; |
const char *value; |
char *oldn, *newn, *end; |
char *oldn, *newn, *end; |
size_t oldsz, newsz; |
size_t oldsz, newsz; |
|
int deftype; |
|
|
oldn = newn = buf->buf + pos; |
oldn = newn = buf->buf + pos; |
if (*oldn == '\0') |
if (*oldn == '\0') |
Line 3128 roff_rn(ROFF_ARGS) |
|
Line 3173 roff_rn(ROFF_ARGS) |
|
if (newsz == 0) |
if (newsz == 0) |
return ROFF_IGN; |
return ROFF_IGN; |
|
|
/* |
deftype = ROFFDEF_ANY; |
* Rename a user-defined macro bearing the old name, |
value = roff_getstrn(r, oldn, oldsz, &deftype); |
* overriding an existing renamed high-level macro |
switch (deftype) { |
* bearing the new name, if that exists. |
case ROFFDEF_USER: |
*/ |
|
|
|
if ((value = roff_getstrn(r, oldn, oldsz)) != NULL) { |
|
roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0); |
roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0); |
roff_setstrn(&r->strtab, oldn, oldsz, NULL, 0, 0); |
roff_setstrn(&r->strtab, oldn, oldsz, NULL, 0, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
return ROFF_IGN; |
break; |
} |
case ROFFDEF_PRE: |
|
roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0); |
/* |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
* Rename a high-level macro bearing the old name, |
break; |
* either renaming it a second time if it was already |
case ROFFDEF_REN: |
* renamed before, or renaming it for the first time. |
|
* In both cases, override an existing user-defined |
|
* macro bearing the new name, if that exists. |
|
*/ |
|
|
|
if ((value = roff_getrenn(r, oldn, oldsz)) != NULL) { |
|
roff_setstrn(&r->rentab, newn, newsz, value, strlen(value), 0); |
roff_setstrn(&r->rentab, newn, newsz, value, strlen(value), 0); |
roff_setstrn(&r->rentab, oldn, oldsz, NULL, 0, 0); |
roff_setstrn(&r->rentab, oldn, oldsz, NULL, 0, 0); |
} else |
roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0); |
|
break; |
|
case ROFFDEF_STD: |
roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 0); |
roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 0); |
roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0); |
roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0); |
|
break; |
|
default: |
|
roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0); |
|
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
|
break; |
|
} |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 3341 roff_renamed(ROFF_ARGS) |
|
Line 3385 roff_renamed(ROFF_ARGS) |
|
{ |
{ |
char *nbuf; |
char *nbuf; |
|
|
buf->sz = mandoc_asprintf(&nbuf, ".%s %s", r->current_string, |
buf->sz = mandoc_asprintf(&nbuf, ".%s%s%s", r->current_string, |
buf->buf + pos) + 1; |
buf->buf[pos] == '\0' ? "" : " ", buf->buf + pos) + 1; |
free(buf->buf); |
free(buf->buf); |
buf->buf = nbuf; |
buf->buf = nbuf; |
return ROFF_CONT; |
return ROFF_CONT; |
|
|
roff_setstr(struct roff *r, const char *name, const char *string, |
roff_setstr(struct roff *r, const char *name, const char *string, |
int append) |
int append) |
{ |
{ |
|
size_t namesz; |
|
|
roff_setstrn(&r->strtab, name, strlen(name), string, |
namesz = strlen(name); |
|
roff_setstrn(&r->strtab, name, namesz, string, |
string ? strlen(string) : 0, append); |
string ? strlen(string) : 0, append); |
|
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
} |
} |
|
|
static void |
static void |
Line 3475 roff_setstrn(struct roffkv **r, const char *name, size |
|
Line 3522 roff_setstrn(struct roffkv **r, const char *name, size |
|
} |
} |
|
|
static const char * |
static const char * |
roff_getstrn(const struct roff *r, const char *name, size_t len) |
roff_getstrn(const struct roff *r, const char *name, size_t len, |
|
int *deftype) |
{ |
{ |
const struct roffkv *n; |
const struct roffkv *n; |
int i; |
int i; |
|
enum roff_tok tok; |
|
|
for (n = r->strtab; n; n = n->next) |
if (*deftype & ROFFDEF_USER) { |
if (0 == strncmp(name, n->key.p, len) && |
for (n = r->strtab; n != NULL; n = n->next) { |
'\0' == n->key.p[(int)len]) |
if (strncmp(name, n->key.p, len) == 0 && |
return n->val.p; |
n->key.p[len] == '\0' && |
|
n->val.p != NULL) { |
for (i = 0; i < PREDEFS_MAX; i++) |
*deftype = ROFFDEF_USER; |
if (0 == strncmp(name, predefs[i].name, len) && |
return n->val.p; |
'\0' == predefs[i].name[(int)len]) |
} |
return predefs[i].str; |
} |
|
} |
return NULL; |
if (*deftype & ROFFDEF_PRE) { |
} |
for (i = 0; i < PREDEFS_MAX; i++) { |
|
if (strncmp(name, predefs[i].name, len) == 0 && |
/* |
predefs[i].name[len] == '\0') { |
* Check whether *name is the renamed name of a high-level macro. |
*deftype = ROFFDEF_PRE; |
* Return the standard name, or NULL if it is not. |
return predefs[i].str; |
*/ |
} |
static const char * |
} |
roff_getrenn(const struct roff *r, const char *name, size_t len) |
} |
{ |
if (*deftype & ROFFDEF_REN) { |
const struct roffkv *n; |
for (n = r->rentab; n != NULL; n = n->next) { |
|
if (strncmp(name, n->key.p, len) == 0 && |
for (n = r->rentab; n; n = n->next) |
n->key.p[len] == '\0' && |
if (0 == strncmp(name, n->key.p, len) && |
n->val.p != NULL) { |
'\0' == n->key.p[(int)len]) |
*deftype = ROFFDEF_REN; |
return n->val.p; |
return n->val.p; |
|
} |
|
} |
|
} |
|
if (*deftype & ROFFDEF_STD) { |
|
if (r->man->macroset != MACROSET_MAN) { |
|
for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) { |
|
if (strncmp(name, roff_name[tok], len) == 0 && |
|
roff_name[tok][len] == '\0') { |
|
*deftype = ROFFDEF_STD; |
|
return NULL; |
|
} |
|
} |
|
} |
|
if (r->man->macroset != MACROSET_MDOC) { |
|
for (tok = MAN_TH; tok < MAN_MAX; tok++) { |
|
if (strncmp(name, roff_name[tok], len) == 0 && |
|
roff_name[tok][len] == '\0') { |
|
*deftype = ROFFDEF_STD; |
|
return NULL; |
|
} |
|
} |
|
} |
|
} |
|
*deftype = 0; |
return NULL; |
return NULL; |
} |
} |
|
|