-/* $Id: man_validate.c,v 1.37 2010/05/15 15:54:39 kristaps Exp $ */
+/* $Id: man_validate.c,v 1.47 2010/07/22 23:03:15 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <limits.h>
#include <stdarg.h>
#include <stdlib.h>
+#include <string.h>
+#include "mandoc.h"
#include "libman.h"
#include "libmandoc.h"
-#define CHKARGS struct man *m, const struct man_node *n
+#define CHKARGS struct man *m, struct man_node *n
typedef int (*v_check)(CHKARGS);
static int check_le5(CHKARGS);
static int check_par(CHKARGS);
static int check_part(CHKARGS);
-static int check_roff(CHKARGS);
static int check_root(CHKARGS);
static int check_sec(CHKARGS);
static int check_text(CHKARGS);
static v_check posts_sec[] = { check_sec, NULL };
static v_check posts_le1[] = { check_le1, NULL };
static v_check pres_bline[] = { check_bline, NULL };
-static v_check pres_roff[] = { check_roff, NULL };
static const struct man_valid man_valids[MAN_MAX] = {
{ NULL, posts_eq0 }, /* br */
{ NULL, NULL }, /* I */
{ NULL, NULL }, /* IR */
{ NULL, NULL }, /* RI */
- { NULL, posts_eq0 }, /* na */
+ { NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
{ NULL, NULL }, /* i */
- { NULL, posts_le1 }, /* sp */
+ { NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
{ pres_bline, posts_eq0 }, /* nf */
{ pres_bline, posts_eq0 }, /* fi */
{ NULL, NULL }, /* r */
{ NULL, NULL }, /* DT */
{ NULL, NULL }, /* UC */
{ NULL, NULL }, /* PD */
- { NULL, posts_le1 }, /* Sp */
- { pres_bline, posts_le1 }, /* Vb */
+ { NULL, posts_le1 }, /* Sp */ /* FIXME: should warn only. */
+ { pres_bline, posts_le1 }, /* Vb */ /* FIXME: should warn only. */
{ pres_bline, posts_eq0 }, /* Ve */
- { pres_roff, NULL }, /* de */
- { pres_roff, NULL }, /* dei */
- { pres_roff, NULL }, /* am */
- { pres_roff, NULL }, /* ami */
- { pres_roff, NULL }, /* ig */
- { NULL, NULL }, /* . */
+ { NULL, NULL }, /* AT */
+ { NULL, NULL }, /* in */
};
int
-man_valid_pre(struct man *m, const struct man_node *n)
+man_valid_pre(struct man *m, struct man_node *n)
{
v_check *cp;
{
if (MAN_BLINE & m->flags)
- return(man_nwarn(m, n, WEXITSCOPE));
+ return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
if (MAN_ELINE & m->flags)
- return(man_nwarn(m, n, WEXITSCOPE));
+ return(man_nmsg(m, n, MANDOCERR_SCOPEEXIT));
m->flags &= ~MAN_BLINE;
m->flags &= ~MAN_ELINE;
- if (NULL == m->first->child)
- return(man_nerr(m, n, WNODATA));
- if (NULL == m->meta.title) {
- if ( ! man_nwarn(m, n, WNOTITLE))
+ if (NULL == m->first->child) {
+ man_nmsg(m, n, MANDOCERR_NODOCBODY);
+ return(0);
+ } else if (NULL == m->meta.title) {
+ if ( ! man_nmsg(m, n, MANDOCERR_NOTITLE))
return(0);
/*
* If a title hasn't been set, do so now (by
const char *p;
assert(n->child);
- if ('\0' == *n->child->string)
- return(man_nerr(m, n, WNOTITLE));
+ /* FIXME: is this sufficient? */
+ if ('\0' == *n->child->string) {
+ man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
+ return(0);
+ }
for (p = n->child->string; '\0' != *p; p++)
if (isalpha((u_char)*p) && ! isupper((u_char)*p))
- if ( ! man_nwarn(m, n, WTITLECASE))
+ if ( ! man_nmsg(m, n, MANDOCERR_UPPERCASE))
return(0);
return(1);
static int
check_text(CHKARGS)
{
- const char *p;
+ char *p;
int pos, c;
-
- assert(n->string);
+ size_t sz;
for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
- if ('\\' == *p) {
- c = mandoc_special(p);
- if (c) {
- p += c - 1;
- pos += c - 1;
+ sz = strcspn(p, "\t\\");
+ p += (int)sz;
+
+ if ('\0' == *p)
+ break;
+
+ pos += (int)sz;
+
+ if ('\t' == *p) {
+ if (MAN_LITERAL & m->flags)
continue;
- }
- if ( ! (MAN_IGN_ESCAPE & m->pflags))
- return(man_perr(m, n->line, pos, WESCAPE));
- if ( ! man_pwarn(m, n->line, pos, WESCAPE))
- return(0);
- continue;
+ if (man_pmsg(m, n->line, pos, MANDOCERR_BADTAB))
+ continue;
+ return(0);
}
- if ('\t' == *p || isprint((u_char)*p))
+ /* Check the special character. */
+
+ c = mandoc_special(p);
+ if (c) {
+ p += c - 1;
+ pos += c - 1;
continue;
+ }
- return(man_pwarn(m, n->line, pos, WNPRINT));
+ c = man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
+ if ( ! (MAN_IGN_ESCAPE & m->pflags) && ! c)
+ return(c);
}
return(1);
{ \
if (n->nchild ineq (x)) \
return(1); \
- return(man_verr(m, n->line, n->pos, \
- "expected line arguments %s %d, have %d", \
- #ineq, (x), n->nchild)); \
+ man_vmsg(m, MANDOCERR_SYNTARGCOUNT, n->line, n->pos, \
+ "line arguments %s %d (have %d)", \
+ #ineq, (x), n->nchild); \
+ return(0); \
}
INEQ_DEFINE(0, ==, eq0)
check_sec(CHKARGS)
{
- if (MAN_BODY == n->type && 0 == n->nchild)
- return(man_nwarn(m, n, WBODYARGS));
- if (MAN_HEAD == n->type && 0 == n->nchild)
- return(man_nerr(m, n, WHEADARGS));
+ if (MAN_HEAD == n->type && 0 == n->nchild) {
+ man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
+ return(0);
+ } else if (MAN_BODY == n->type && 0 == n->nchild)
+ return(man_nmsg(m, n, MANDOCERR_NOBODY));
+
return(1);
}
{
if (MAN_BODY == n->type && 0 == n->nchild)
- return(man_nwarn(m, n, WBODYARGS));
+ return(man_nmsg(m, n, MANDOCERR_NOBODY));
return(1);
}
default:
if (n->nchild)
break;
- return(man_nwarn(m, n, WBODYARGS));
+ return(man_nmsg(m, n, MANDOCERR_NOBODY));
}
if (MAN_HEAD == n->type)
switch (n->tok) {
case (MAN_LP):
if (0 == n->nchild)
break;
- return(man_nwarn(m, n, WNHEADARGS));
+ return(man_nmsg(m, n, MANDOCERR_ARGSLOST));
default:
if (n->nchild)
break;
- return(man_nwarn(m, n, WHEADARGS));
+ return(man_nmsg(m, n, MANDOCERR_NOARGS));
}
return(1);
{
assert( ! (MAN_ELINE & m->flags));
- if (MAN_BLINE & m->flags)
- return(man_nerr(m, n, WLNSCOPE));
+ if (MAN_BLINE & m->flags) {
+ man_nmsg(m, n, MANDOCERR_SYNTLINESCOPE);
+ return(0);
+ }
return(1);
}
-
-static int
-check_roff(CHKARGS)
-{
-
- if (MAN_BLOCK != n->type)
- return(1);
-
- for (n = n->parent; n; n = n->parent)
- if (MAN_de == n->tok || MAN_dei == n->tok ||
- MAN_am == n->tok ||
- MAN_ami == n->tok ||
- MAN_ig == n->tok)
- return(man_nerr(m, n, WROFFNEST));
-
- return(1);
-}
git.ckatri.com / mandoc.git / blobdiff