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.79 and 1.87

version 1.79, 2010/05/17 22:11:42

version 1.87, 2010/05/30 22:56:02

Line 23

#include <assert.h>

#include <ctype.h>

#include <limits.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

Line 82 static int post_at(POST_ARGS);

Line 83 static int post_at(POST_ARGS);

static int post_bf(POST_ARGS);

static int post_bl(POST_ARGS);

static int post_bl_head(POST_ARGS);

static int post_dt(POST_ARGS);

static int post_it(POST_ARGS);

static int post_lb(POST_ARGS);

static int post_nm(POST_ARGS);

Line 91 static int post_sh(POST_ARGS);

Line 93 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_eoln(POST_ARGS);

static int post_vt(POST_ARGS);

static int pre_an(PRE_ARGS);

static int pre_bd(PRE_ARGS);

Line 110 static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NU

Line 113 static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NU

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

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

static v_post posts_bool[] = { eerr_eq1, ebool, NULL };

static v_post posts_eoln[] = { post_eoln, NULL };

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

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

static v_post posts_it[] = { post_it, NULL };

static v_post posts_lb[] = { eerr_eq1, post_lb, NULL };

Line 126 static v_post posts_text1[] = { eerr_eq1, NULL };

Line 131 static v_post posts_text1[] = { eerr_eq1, NULL };

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_post posts_xr[] = { ewarn_ge1, NULL };

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

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

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

Line 137 static v_pre pres_er[] = { NULL, NULL };

Line 141 static v_pre pres_er[] = { NULL, NULL };

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_lb[] = { NULL, NULL };

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

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

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

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

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

const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Ap */

{ pres_dd, posts_text }, /* Dd */

{ pres_dt, NULL }, /* Dt */

{ pres_dt, posts_dt }, /* Dt */

{ pres_os, NULL }, /* Os */

{ pres_sh, posts_sh }, /* Sh */

{ pres_ss, posts_ss }, /* Ss */

Line 184 const struct valids mdoc_valids[MDOC_MAX] = {

Line 187 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, posts_st }, /* St */

{ NULL, NULL }, /* Va */

{ NULL, posts_vt }, /* Vt */

{ NULL, posts_xr }, /* Xr */

{ NULL, posts_wtext }, /* Xr */

{ NULL, posts_text }, /* %A */

{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */

{ NULL, posts_text }, /* %D */ /* FIXME: check date with mandoc_a2time(). */

Line 246 const struct valids mdoc_valids[MDOC_MAX] = {

Line 249 const struct valids mdoc_valids[MDOC_MAX] = {

{ NULL, NULL }, /* Oc */

{ NULL, posts_wline }, /* Bk */

{ NULL, NULL }, /* Ek */

{ NULL, posts_notext }, /* Bt */

{ NULL, posts_eoln }, /* Bt */

{ NULL, NULL }, /* Hf */

{ NULL, NULL }, /* Fr */

{ NULL, posts_notext }, /* Ud */

{ NULL, posts_eoln }, /* Ud */

{ pres_lb, posts_lb }, /* Lb */

{ NULL, posts_lb }, /* Lb */

{ NULL, posts_notext }, /* Lp */

{ NULL, posts_text }, /* Lk */

{ NULL, posts_text }, /* Mt */

Line 391 CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */

Line 394 CHECK_CHILD_DEFN(err, lt, <) /* err_child_lt() */

CHECK_CHILD_DEFN(warn, lt, <) /* warn_child_lt() */

CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0) /* bwarn_ge1() */

CHECK_BODY_DEFN(ge1, err, err_child_gt, 0) /* berr_ge1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_gt1() */

CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0) /* ewarn_ge1() */

CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1) /* eerr_eq1() */

CHECK_ELEM_DEFN(le1, err, err_child_lt, 2) /* eerr_le1() */

CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0) /* eerr_eq0() */

Line 462 check_text(struct mdoc *mdoc, int line, int pos, const

Line 465 check_text(struct mdoc *mdoc, int line, int pos, const

if ( ! (MDOC_LITERAL & mdoc->flags))

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

return(0);

} else if ( ! isprint((u_char)*p))

} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)

if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))

return(0);

Line 568 pre_bl(PRE_ARGS)

Line 571 pre_bl(PRE_ARGS)

case (MDOC_Inset):

/* FALLTHROUGH */

case (MDOC_Column):

if (type < 0) {

* Note that if a duplicate is detected, we

type = n->args->argv[pos].arg;

* remove the duplicate instead of passing it

* over. If we don't do this, mdoc_action will

* become confused when it scans over multiple

* types whilst setting its bitmasks.

* FIXME: this should occur in mdoc_action.c.

if (type >= 0) {

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))

return(0);

mdoc_argn_free(n->args, pos);

break;

}

type = n->args->argv[pos].arg;

if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))

break;

return(0);

case (MDOC_Compact):

if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

if (type >= 0)

return(0);

break;

if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))

break;

return(0);

case (MDOC_Width):

if (width >= 0)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))

Line 745 pre_rv(PRE_ARGS)

Line 740 pre_rv(PRE_ARGS)

static int

pre_dt(PRE_ARGS)

post_dt(POST_ARGS)

{

const struct mdoc_node *nn;

const char *p;

/* FIXME: make sure is capitalised. */

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

for (p = nn->string; *p; p++) {

if (toupper((u_char)*p) == *p)

continue;

if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE))

return(0);

break;

}

return(1);

}

static int

pre_dt(PRE_ARGS)

{

if (0 == mdoc->meta.date || mdoc->meta.os)

if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))

return(0);

Line 837 post_lb(POST_ARGS)

Line 849 post_lb(POST_ARGS)

static int

post_eoln(POST_ARGS)

{

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

return(1);

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

}

static int

post_vt(POST_ARGS)

{

const struct mdoc_node *n;

Line 906 post_an(POST_ARGS)

Line 928 post_an(POST_ARGS)

static int

post_it(POST_ARGS)

{

/* FIXME: use mdoc_list! */

int type, i, cols;

struct mdoc_node *n, *c;

Line 995 post_it(POST_ARGS)

Line 1018 post_it(POST_ARGS)

return(0);

break;

case (MDOC_Column):

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

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

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

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

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

return(0);

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

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

/* Count up the number of columns. */

return(0);

c = mdoc->last->child;

for (i = 0; c && MDOC_HEAD == c->type; c = c->next)

for (i = 0; c; c = c->next)

i++;

if (MDOC_BODY == c->type)

i++;

if (i < cols) {

if ( ! mdoc_vmsg(mdoc, MANDOCERR_ARGCOUNT,

Line 1232 post_sh_body(POST_ARGS)

Line 1256 post_sh_body(POST_ARGS)

static int

post_sh_head(POST_ARGS)

{

char buf[64];

char buf[BUFSIZ];

enum mdoc_sec sec;

const struct mdoc_node *n;

Line 1254 post_sh_head(POST_ARGS)

Line 1278 post_sh_head(POST_ARGS)

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

assert(MDOC_TEXT == n->type);

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

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

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

if (NULL == n->next)

continue;

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

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

mdoc_nmsg(mdoc, n, MANDOCERR_MEM);

return(0);

}

CVSweb