mandoc/mdoc_validate.c - diff

Return to mdoc_validate.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_validate.c between version 1.222 and 1.233

version 1.222, 2014/07/02 19:55:10

version 1.233, 2014/07/30 12:58:21

Line 84 static int ewarn_le1(POST_ARGS);

static int hwarn_eq0(POST_ARGS);

static int hwarn_eq1(POST_ARGS);

static int hwarn_ge1(POST_ARGS);

static int hwarn_le1(POST_ARGS);

static int post_an(POST_ARGS);

static int post_at(POST_ARGS);

Line 101 static int post_dt(POST_ARGS);

Line 100 static int post_dt(POST_ARGS);

static int post_en(POST_ARGS);

static int post_es(POST_ARGS);

static int post_eoln(POST_ARGS);

static int post_ex(POST_ARGS);

static int post_hyph(POST_ARGS);

static int post_ignpar(POST_ARGS);

static int post_it(POST_ARGS);

Line 117 static int post_sh(POST_ARGS);

static int post_sh_body(POST_ARGS);

static int post_sh_head(POST_ARGS);

static int post_st(POST_ARGS);

static int post_std(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 137 static int pre_std(PRE_ARGS);

Line 136 static int pre_std(PRE_ARGS);

static v_post posts_an[] = { post_an, NULL };

static v_post posts_at[] = { post_at, post_defaults, NULL };

static v_post posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bf[] = { hwarn_le1, post_bf, NULL };

static v_post posts_bf[] = { post_bf, NULL };

static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL };

static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL };

static v_post posts_bx[] = { post_bx, NULL };

Line 150 static v_post posts_dl[] = { post_literal, bwarn_ge1,

Line 149 static v_post posts_dl[] = { post_literal, bwarn_ge1,

static v_post posts_dt[] = { post_dt, post_prol, NULL };

static v_post posts_en[] = { post_en, NULL };

static v_post posts_es[] = { post_es, NULL };

static v_post posts_ex[] = { post_ex, NULL };

static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };

static v_post posts_hyph[] = { post_hyph, NULL };

static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL };

Line 166 static v_post posts_sh[] = { post_ignpar,hwarn_ge1,po

static v_post posts_sp[] = { post_par, ewarn_le1, NULL };

static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL };

static v_post posts_st[] = { post_st, NULL };

static v_post posts_std[] = { post_std, NULL };

static v_post posts_text[] = { ewarn_ge1, NULL };

static v_post posts_text1[] = { ewarn_eq1, NULL };

static v_post posts_vt[] = { post_vt, NULL };

Line 208 static const struct valids mdoc_valids[MDOC_MAX] = {

Line 207 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Dv */

{ NULL, NULL }, /* Er */

{ NULL, NULL }, /* Ev */

{ pres_std, posts_std }, /* Ex */

{ pres_std, posts_ex }, /* Ex */

{ NULL, NULL }, /* Fa */

{ NULL, posts_text }, /* Fd */

{ NULL, NULL }, /* Fl */

Line 222 static const struct valids mdoc_valids[MDOC_MAX] = {

Line 221 static const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Op */

{ pres_obsolete, NULL }, /* Ot */

{ NULL, posts_defaults }, /* Pa */

{ pres_std, posts_std }, /* Rv */

{ pres_std, NULL }, /* Rv */

{ NULL, posts_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

Line 515 hwarn_ge1(POST_ARGS)

Line 514 hwarn_ge1(POST_ARGS)

return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0));

}

static int

hwarn_le1(POST_ARGS)

{

return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2));

}

static void

check_args(struct mdoc *mdoc, struct mdoc_node *n)

{

Line 541 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str

Line 534 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str

for (i = 0; i < (int)v->sz; i++)

check_text(mdoc, v->line, v->pos, v->value[i]);

/* FIXME: move to post_std(). */

if (MDOC_Std == v->arg)

if ( ! (v->sz || mdoc->meta.name))

mdoc_nmsg(mdoc, n, MANDOCERR_NONAME);

}

static void

Line 558 check_text(struct mdoc *mdoc, int ln, int pos, char *p

Line 545 check_text(struct mdoc *mdoc, int ln, int pos, char *p

return;

for (cp = p; NULL != (p = strchr(p, '\t')); p++)

mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);

mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,

ln, pos + (int)(p - cp), NULL);

}

static int

Line 601 pre_display(PRE_ARGS)

Line 589 pre_display(PRE_ARGS)

static int

pre_bl(PRE_ARGS)

{

int i, comp, dup;

const char *offs, *width;

enum mdoc_list lt;

struct mdoc_node *np;

struct mdoc_argv *argv;

int i;

enum mdoc_list lt;

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

Line 626 pre_bl(PRE_ARGS)

Line 614 pre_bl(PRE_ARGS)

for (i = 0; n->args && i < (int)n->args->argc; i++) {

argv = n->args->argv + i;

lt = LIST__NONE;

dup = comp = 0;

switch (argv->arg) {

width = offs = NULL;

switch (n->args->argv[i].arg) {

/* Set list types. */

case MDOC_Bullet:

lt = LIST_bullet;

Line 666 pre_bl(PRE_ARGS)

Line 653 pre_bl(PRE_ARGS)

break;

/* Set list arguments. */

case MDOC_Compact:

dup = n->norm->Bl.comp;

if (n->norm->Bl.comp)

comp = 1;

mandoc_msg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -compact");

n->norm->Bl.comp = 1;

break;

case MDOC_Width:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

width = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bl.width);

argv->pos, "Bl -width");

n->norm->Bl.width = "0n";

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bl.width)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -width %s",

argv->value[0]);

n->norm->Bl.width = argv->value[0];

break;

case MDOC_Offset:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

offs = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bl.offs);

argv->pos, "Bl -offset");

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bl.offs)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bl -offset %s",

argv->value[0]);

n->norm->Bl.offs = argv->value[0];

break;

default:

continue;

}

if (LIST__NONE == lt)

continue;

/* Check: duplicate auxiliary arguments. */

if (dup)

mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

if (comp && ! dup)

n->norm->Bl.comp = comp;

if (offs && ! dup)

n->norm->Bl.offs = offs;

if (width && ! dup)

n->norm->Bl.width = width;

/* Check: multiple list types. */

if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)

if (LIST__NONE != n->norm->Bl.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);

mandoc_msg(MANDOCERR_BL_REP,

mdoc->parse, n->line, n->pos,

/* Assign list type. */

mdoc_argnames[argv->arg]);

continue;

if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {

n->norm->Bl.type = lt;

/* Set column information, too. */

if (LIST_column == lt) {

n->norm->Bl.ncols =

n->args->argv[i].sz;

n->norm->Bl.cols = (void *)

n->args->argv[i].value;

}

/* The list type should come first. */

if (n->norm->Bl.type == LIST__NONE)

if (n->norm->Bl.width ||

n->norm->Bl.offs ||

n->norm->Bl.comp)

mandoc_msg(MANDOCERR_BL_LATETYPE,

mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);

mdoc->parse, n->line, n->pos,

mdoc_argnames[n->args->argv[0].arg]);

continue;

n->norm->Bl.type = lt;

if (LIST_column == lt) {

n->norm->Bl.ncols = argv->sz;

n->norm->Bl.cols = (void *)argv->value;

}

/* Allow lists to default to LIST_item. */

if (LIST__NONE == n->norm->Bl.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE);

n->norm->Bl.type = LIST_item;

}

Line 749 pre_bl(PRE_ARGS)

Line 736 pre_bl(PRE_ARGS)

switch (n->norm->Bl.type) {

case LIST_tag:

if (NULL == n->norm->Bl.width)

mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);

mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOWIDTH);

break;

case LIST_column:

/* FALLTHROUGH */

Line 785 pre_bl(PRE_ARGS)

Line 772 pre_bl(PRE_ARGS)

static int

pre_bd(PRE_ARGS)

{

int i, dup, comp;

enum mdoc_disp dt;

const char *offs;

struct mdoc_node *np;

struct mdoc_argv *argv;

int i;

enum mdoc_disp dt;

if (MDOC_BLOCK != n->type) {

if (ENDBODY_NOT != n->end) {

Line 804 pre_bd(PRE_ARGS)

Line 791 pre_bd(PRE_ARGS)

}

for (i = 0; n->args && i < (int)n->args->argc; i++) {

argv = n->args->argv + i;

dt = DISP__NONE;

dup = comp = 0;

offs = NULL;

switch (n->args->argv[i].arg) {

switch (argv->arg) {

case MDOC_Centred:

dt = DISP_centred;

dt = DISP_centered;

break;

case MDOC_Ragged:

dt = DISP_ragged;

Line 828 pre_bd(PRE_ARGS)

Line 814 pre_bd(PRE_ARGS)

mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);

return(0);

case MDOC_Offset:

/* NB: this can be empty! */

if (0 == argv->sz) {

if (n->args->argv[i].sz) {

mandoc_msg(MANDOCERR_ARG_EMPTY,

offs = n->args->argv[i].value[0];

mdoc->parse, argv->line,

dup = (NULL != n->norm->Bd.offs);

argv->pos, "Bd -offset");

break;

}

mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

if (NULL != n->norm->Bd.offs)

mandoc_vmsg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bd -offset %s",

argv->value[0]);

n->norm->Bd.offs = argv->value[0];

break;

case MDOC_Compact:

comp = 1;

if (n->norm->Bd.comp)

dup = n->norm->Bd.comp;

mandoc_msg(MANDOCERR_ARG_REP,

mdoc->parse, argv->line,

argv->pos, "Bd -compact");

n->norm->Bd.comp = 1;

break;

default:

abort();

/* NOTREACHED */

}

if (DISP__NONE == dt)

continue;

/* Check whether we have duplicates. */

if (DISP__NONE == n->norm->Bd.type)

if (dup)

mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

/* Make our auxiliary assignments. */

if (offs && ! dup)

n->norm->Bd.offs = offs;

if (comp && ! dup)

n->norm->Bd.comp = comp;

/* Check whether a type has already been assigned. */

if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE)

mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);

/* Make our type assignment. */

if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)

n->norm->Bd.type = dt;

else

mandoc_msg(MANDOCERR_BD_REP,

mdoc->parse, n->line, n->pos,

mdoc_argnames[argv->arg]);

}

if (DISP__NONE == n->norm->Bd.type) {

mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);

mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE);

n->norm->Bd.type = DISP_ragged;

}

Line 934 pre_std(PRE_ARGS)

Line 915 pre_std(PRE_ARGS)

if (MDOC_Std == n->args->argv[0].arg)

return(1);

mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV);

mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

return(1);

}

Line 996 pre_dd(PRE_ARGS)

Line 978 pre_dd(PRE_ARGS)

static int

post_bf(POST_ARGS)

{

struct mdoc_node *np;

struct mdoc_node *np, *nch;

enum mdocargt arg;

Line 1023 post_bf(POST_ARGS)

Line 1005 post_bf(POST_ARGS)

assert(MDOC_BLOCK == np->parent->type);

assert(MDOC_Bf == np->parent->tok);

/* Check the number of arguments. */

* Cannot have both argument and parameter.

* If neither is specified, let it through with a warning.

if (np->parent->args && np->child) {

nch = np->child;

mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);

if (NULL == np->parent->args) {

return(0);

if (NULL == nch) {

} else if (NULL == np->parent->args && NULL == np->child) {

mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT);

mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);

return(1);

}

nch = nch->next;

}

if (NULL != nch)

mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,

nch->line, nch->pos, "Bf ... %s", nch->string);

/* Extract argument into data. */

Line 1060 post_bf(POST_ARGS)

Line 1043 post_bf(POST_ARGS)

else if (0 == strcmp(np->child->string, "Sy"))

np->norm->Bf.font = FONT_Sy;

else

mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);

mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,

np->child->line, np->child->pos,

"Bf %s", np->child->string);

return(1);

}

Line 1093 post_lb(POST_ARGS)

Line 1078 post_lb(POST_ARGS)

static int

post_eoln(POST_ARGS)

{

const struct mdoc_node *n;

if (mdoc->last->child)

n = mdoc->last;

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);

if (n->child)

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, n->line, n->pos,

"%s %s", mdoc_macronames[n->tok],

n->child->string);

return(1);

}

Line 1132 post_nm(POST_ARGS)

Line 1122 post_nm(POST_ARGS)

mdoc_deroff(&mdoc->meta.name, mdoc->last);

if (NULL == mdoc->meta.name) {

if (NULL == mdoc->meta.name)

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NM_NONAME);

mdoc->meta.name = mandoc_strdup("UNKNOWN");

}

return(1);

}

Line 1223 post_at(POST_ARGS)

Line 1211 post_at(POST_ARGS)

assert(MDOC_TEXT == n->type);

if (NULL == (std_att = mdoc_a2att(n->string))) {

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);

mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse,

n->line, n->pos, n->string);

mandoc_asprintf(&att, "AT&T UNIX %s", n->string);

} else

att = mandoc_strdup(std_att);

Line 1270 post_it(POST_ARGS)

Line 1259 post_it(POST_ARGS)

{

int i, cols;

enum mdoc_list lt;

struct mdoc_node *n, *c;

struct mdoc_node *nbl, *nit, *nch;

enum mandocerr er;

if (MDOC_BLOCK != mdoc->last->type)

nit = mdoc->last;

if (MDOC_BLOCK != nit->type)

return(1);

n = mdoc->last->parent->parent;

nbl = nit->parent->parent;

lt = n->norm->Bl.type;

lt = nbl->norm->Bl.type;

if (LIST__NONE == lt) {

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);

return(1);

}

switch (lt) {

case LIST_tag:

if (mdoc->last->head->child)

/* FALLTHROUGH */

break;

/* FIXME: give this a dummy value. */

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);

break;

case LIST_hang:

/* FALLTHROUGH */

case LIST_ohang:

Line 1298 post_it(POST_ARGS)

Line 1279 post_it(POST_ARGS)

case LIST_inset:

/* FALLTHROUGH */

case LIST_diag:

if (NULL == mdoc->last->head->child)

if (NULL == nit->head->child)

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);

mandoc_msg(MANDOCERR_IT_NOHEAD,

mdoc->parse, nit->line, nit->pos,

mdoc_argnames[nbl->args->argv[0].arg]);

break;

case LIST_bullet:

/* FALLTHROUGH */

Line 1308 post_it(POST_ARGS)

Line 1291 post_it(POST_ARGS)

case LIST_enum:

/* FALLTHROUGH */

case LIST_hyphen:

if (NULL == mdoc->last->body->child)

if (NULL == nit->body->child)

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);

mandoc_msg(MANDOCERR_IT_NOBODY,

mdoc->parse, nit->line, nit->pos,

mdoc_argnames[nbl->args->argv[0].arg]);

/* FALLTHROUGH */

case LIST_item:

if (mdoc->last->head->child)

if (NULL != nit->head->child)

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, nit->line, nit->pos,

"It %s", nit->head->child->string);

break;

case LIST_column:

cols = (int)n->norm->Bl.ncols;

cols = (int)nbl->norm->Bl.ncols;

assert(NULL == mdoc->last->head->child);

assert(NULL == nit->head->child);

if (NULL == mdoc->last->body->child)

for (i = 0, nch = nit->child; nch; nch = nch->next)

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);

if (MDOC_BODY == nch->type)

for (i = 0, c = mdoc->last->child; c; c = c->next)

if (MDOC_BODY == c->type)

i++;

if (i < cols)

Line 1334 post_it(POST_ARGS)

Line 1318 post_it(POST_ARGS)

else

er = MANDOCERR_SYNTARGCOUNT;

mandoc_vmsg(er, mdoc->parse,

mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos,

mdoc->last->line, mdoc->last->pos,

"columns == %d (have %d)", cols, i);

return(MANDOCERR_ARGCOUNT == er);

default:

break;

abort();

}

return(1);

Line 1432 post_bl_block_width(POST_ARGS)

Line 1415 post_bl_block_width(POST_ARGS)

width = 6;

else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))

return(1);

else if (0 == (width = macro2len(tok))) {

else

mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);

width = macro2len(tok);

return(1);

}

/* The value already exists: free and reallocate it. */

Line 1666 post_bl(POST_ARGS)

Line 1647 post_bl(POST_ARGS)

static int

ebool(struct mdoc *mdoc)

{

struct mdoc_node *nch;

enum mdoct tok;

if (NULL == mdoc->last->child) {

tok = mdoc->last->tok;

if (MDOC_Sm == mdoc->last->tok)

nch = mdoc->last->child;

if (NULL == nch) {

if (MDOC_Sm == tok)

mdoc->flags ^= MDOC_SMOFF;

return(1);

}

check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2);

assert(MDOC_TEXT == mdoc->last->child->type);

assert(MDOC_TEXT == nch->type);

if (0 == strcmp(mdoc->last->child->string, "on")) {

if (0 == strcmp(nch->string, "on")) {

if (MDOC_Sm == mdoc->last->tok)

if (MDOC_Sm == tok)

mdoc->flags &= ~MDOC_SMOFF;

return(1);

}

if (0 == strcmp(mdoc->last->child->string, "off")) {

if (0 == strcmp(nch->string, "off")) {

if (MDOC_Sm == mdoc->last->tok)

if (MDOC_Sm == tok)

mdoc->flags |= MDOC_SMOFF;

return(1);

}

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL);

mandoc_vmsg(MANDOCERR_SM_BAD,

return(1);

mdoc->parse, nch->line, nch->pos,

"%s %s", mdoc_macronames[tok], nch->string);

return(mdoc_node_relink(mdoc, nch));

}

static int

Line 1725 post_root(POST_ARGS)

Line 1713 post_root(POST_ARGS)

static int

post_st(POST_ARGS)

{

struct mdoc_node *ch;

struct mdoc_node *n, *nch;

const char *p;

if (NULL == (ch = mdoc->last->child)) {

n = mdoc->last;

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY);

nch = n->child;

mdoc_node_delete(mdoc, mdoc->last);

if (NULL == nch) {

mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

mdoc_node_delete(mdoc, n);

return(1);

}

assert(MDOC_TEXT == ch->type);

assert(MDOC_TEXT == nch->type);

if (NULL == (p = mdoc_a2st(ch->string))) {

if (NULL == (p = mdoc_a2st(nch->string))) {

mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD);

mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse,

mdoc_node_delete(mdoc, mdoc->last);

nch->line, nch->pos, nch->string);

mdoc_node_delete(mdoc, n);

} else {

free(ch->string);

free(nch->string);

ch->string = mandoc_strdup(p);

nch->string = mandoc_strdup(p);

}

return(1);

Line 1767 post_rs(POST_ARGS)

Line 1760 post_rs(POST_ARGS)

}

* Make sure only certain types of nodes are allowed within the

* the `Rs' body. Delete offending nodes and raise a warning.

* Do this before re-ordering for the sake of clarity.

next = NULL;

for (nn = mdoc->last->child; nn; nn = next) {

for (i = 0; i < RSORD_MAX; i++)

if (nn->tok == rsord[i])

break;

if (i < RSORD_MAX) {

if (MDOC__J == rsord[i] || MDOC__B == rsord[i])

mdoc->last->norm->Rs.quote_T++;

next = nn->next;

continue;

}

next = nn->next;

mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse,

nn->line, nn->pos, mdoc_macronames[nn->tok]);

mdoc_node_delete(mdoc, nn);

}

* Nothing to sort if only invalid nodes were found

* inside the `Rs' body.

if (NULL == mdoc->last->child)

return(1);

* The full `Rs' block needs special handling to order the

* sub-elements according to `rsord'. Pick through each element

* and correctly order it. This is a insertion sort.

* and correctly order it. This is an insertion sort.

next = NULL;

Line 1812 post_rs(POST_ARGS)

Line 1772 post_rs(POST_ARGS)

if (rsord[i] == nn->tok)

break;

if (i == RSORD_MAX) {

mandoc_msg(MANDOCERR_RS_BAD,

mdoc->parse, nn->line, nn->pos,

mdoc_macronames[nn->tok]);

i = -1;

} else if (MDOC__J == nn->tok || MDOC__B == nn->tok)

mdoc->last->norm->Rs.quote_T++;

* Remove `nn' from the chain. This somewhat

* repeats mdoc_node_unlink(), but since we're

Line 1837 post_rs(POST_ARGS)

Line 1805 post_rs(POST_ARGS)

for (j = 0; j < RSORD_MAX; j++)

if (rsord[j] == prev->tok)

break;

if (j == RSORD_MAX)

j = -1;

if (j <= i)

break;

Line 2406 post_os(POST_ARGS)

Line 2376 post_os(POST_ARGS)

#else /*!OSNAME */

if (NULL == defbuf) {

if (-1 == uname(&utsname)) {

mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);

mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,

n->line, n->pos, "Os");

defbuf = mandoc_strdup("UNKNOWN");

} else

mandoc_asprintf(&defbuf, "%s %s",

Line 2417 post_os(POST_ARGS)

Line 2388 post_os(POST_ARGS)

return(1);

}

* If no argument is provided,

* fill in the name of the current manual page.

static int

post_std(POST_ARGS)

post_ex(POST_ARGS)

{

struct mdoc_node *nn, *n;

struct mdoc_node *n;

n = mdoc->last;

* Macros accepting `-std' as an argument have the name of the

* current document (`Nm') filled in as the argument if it's not

* provided.

if (n->child)

return(1);

if (NULL == mdoc->meta.name)

if (mdoc->meta.name == NULL) {

mdoc_nmsg(mdoc, n, MANDOCERR_EX_NONAME);

return(1);

}

nn = n;

mdoc->next = MDOC_NEXT_CHILD;

if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name))

return(0);

mdoc->last = nn;

mdoc->last = n;

return(1);

}

CVSweb