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.123 and 1.127

version 1.123, 2010/11/29 13:02:47

version 1.127, 2010/11/29 14:56:43

Line 106 static int pre_display(PRE_ARGS);

static int pre_dt(PRE_ARGS);

static int pre_it(PRE_ARGS);

static int pre_os(PRE_ARGS);

static int pre_pp(PRE_ARGS);

static int pre_par(PRE_ARGS);

static int pre_rv(PRE_ARGS);

static int pre_sh(PRE_ARGS);

static int pre_ss(PRE_ARGS);

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

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

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

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

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

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

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

static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL };

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

static v_pre pres_an[] = { pre_an, NULL };

static v_pre pres_bd[] = { pre_display, pre_bd, pre_pp, NULL };

static v_pre pres_bd[] = { pre_display, pre_bd, pre_par, NULL };

static v_pre pres_bl[] = { pre_bl, pre_pp, NULL };

static v_pre pres_bl[] = { pre_bl, pre_par, NULL };

static v_pre pres_d1[] = { pre_display, NULL };

static v_pre pres_dd[] = { pre_dd, NULL };

static v_pre pres_dt[] = { pre_dt, NULL };

Line 147 static v_pre pres_ex[] = { NULL, NULL };

static v_pre pres_fd[] = { NULL, NULL };

static v_pre pres_it[] = { pre_it, NULL };

static v_pre pres_os[] = { pre_os, NULL };

static v_pre pres_pp[] = { pre_pp, NULL };

static v_pre pres_pp[] = { pre_par, NULL };

static v_pre pres_rv[] = { pre_rv, NULL };

static v_pre pres_sh[] = { pre_sh, NULL };

static v_pre pres_ss[] = { pre_ss, NULL };

Line 1077 post_bf(POST_ARGS)

return(1);

}

static int

post_lb(POST_ARGS)

{

const char *p;

char *buf;

size_t sz;

if (mdoc_a2lib(mdoc->last->child->string))

assert(mdoc->last->child);

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

p = mdoc_a2lib(mdoc->last->child->string);

/* If lookup ok, replace with table value. */

if (p) {

free(mdoc->last->child->string);

mdoc->last->child->string = mandoc_strdup(p);

return(1);

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADLIB));

}

/* If not, use "library ``xxxx''. */

sz = strlen(mdoc->last->child->string) +

2 + strlen("\\(lqlibrary\\(rq");

buf = mandoc_malloc(sz);

snprintf(buf, sz, "library \\(lq%s\\(rq",

mdoc->last->child->string);

free(mdoc->last->child->string);

mdoc->last->child->string = buf;

return(1);

}

static int

post_eoln(POST_ARGS)

{

Line 1159 post_defaults(POST_ARGS)

Line 1180 post_defaults(POST_ARGS)

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))

return(0);

break;

case (MDOC_At):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T"))

return(0);

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX"))

return(0);

break;

case (MDOC_Li):

if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))

return(0);

Line 1179 post_defaults(POST_ARGS)

Line 1206 post_defaults(POST_ARGS)

static int

post_at(POST_ARGS)

{

const char *p, *q;

char *buf;

size_t sz;

* If we have a child, look it up in the standard keys. If a

* key exist, use that instead of the child; if it doesn't,

* prefix "AT&T UNIX " to the existing data.

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

return(1);

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

if (mdoc_a2att(mdoc->last->child->string))

p = mdoc_a2att(mdoc->last->child->string);

return(1);

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

}

if (p) {

free(mdoc->last->child->string);

mdoc->last->child->string = mandoc_strdup(p);

} else {

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

p = "AT&T UNIX ";

q = mdoc->last->child->string;

sz = strlen(p) + strlen(q) + 1;

buf = mandoc_malloc(sz);

strlcpy(buf, p, sz);

strlcat(buf, q, sz);

free(mdoc->last->child->string);

mdoc->last->child->string = buf;

}

return(1);

}

static int

post_an(POST_ARGS)

{

Line 1544 post_sh_body(POST_ARGS)

Line 1595 post_sh_body(POST_ARGS)

static int

post_sh_head(POST_ARGS)

{

char buf[BUFSIZ];

enum mdoc_sec sec;

const struct mdoc_node *n;

struct mdoc_node *n;

* Process a new section. Sections are either "named" or

* "custom"; custom sections are user-defined, while named ones

* "custom". Custom sections are user-defined, while named ones

* usually follow a conventional order and may only appear in

* follow a conventional order and may only appear in certain

* certain manual sections.

* manual sections.

buf[0] = '\0';

/* FIXME: use dynamic buffer... */

* FIXME: yes, these can use a dynamic buffer, but I don't do so

* in the interests of simplicity.

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

/* XXX - copied from compact(). */

/* XXX - copied from concat(). */

assert(MDOC_TEXT == n->type);

if (strlcat(buf, n->string, BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

if (NULL == n->next)

continue;

if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

Line 1580 post_sh_head(POST_ARGS)

Line 1630 post_sh_head(POST_ARGS)

sec = mdoc_str2sec(buf);

/* The NAME should be first. */

* Check: NAME should always be first, CUSTOM has no roles,

* non-CUSTOM has a conventional order to be followed.

if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST))

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

return(0);

/* The SYNOPSIS gets special attention in other areas. */

if (SEC_SYNOPSIS == sec)

mdoc->flags |= MDOC_SYNOPSIS;

else

mdoc->flags &= ~MDOC_SYNOPSIS;

/* Mark our last section. */

mdoc->lastsec = sec;

/* We don't care about custom sections after this. */

if (SEC_CUSTOM == sec)

return(1);

* Check whether our non-custom section is being repeated or is

* out of order.

if (sec == mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP))

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

return(0);

if (sec < mdoc->lastnamed)

if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO))

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

return(0);

/* Mark the last named section. */

* Check particular section/manual conventions. LIBRARY can

* only occur in manual section 2, 3, and 9.

mdoc->lastnamed = sec;

/* Check particular section/manual conventions. */

assert(mdoc->meta.msec);

switch (sec) {

case (SEC_RETURN_VALUES):

/* FALLTHROUGH */

case (SEC_ERRORS):

/* FALLTHROUGH */

case (SEC_LIBRARY):

assert(mdoc->meta.msec);

if (*mdoc->meta.msec == '2')

break;

if (*mdoc->meta.msec == '3')

break;

if (*mdoc->meta.msec == '9')

break;

return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC));

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

break;

default:

break;

}

Line 1622 post_sh_head(POST_ARGS)

Line 1691 post_sh_head(POST_ARGS)

return(1);

}

static int

pre_pp(PRE_ARGS)

pre_par(PRE_ARGS)

{

if (NULL == mdoc->last)

return(1);

/* Don't allow prior `Lp' or `Pp'. */

* Don't allow prior `Lp' or `Pp' prior to a paragraph-type

* block: `Lp', `Pp', or non-compact `Bd' or `Bl'.

if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)

return(1);

CVSweb