summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-07-24 20:22:24 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-07-24 20:22:24 +0000
commit0d8aacabe1e3f7fd5a9be49188ca96e229c4fb6a (patch)
tree2078783f3427b073da8982323c2ff70ceae4e3da
parent01f69fb32c4ca7b2a3feed66a73e89239f256947 (diff)
downloadmandoc-0d8aacabe1e3f7fd5a9be49188ca96e229c4fb6a.tar.gz
Added `sp' support to libman.
Added `\c' to known escapes (only used in man, but still).
-rw-r--r--libman.h1
-rw-r--r--man.c3
-rw-r--r--man.h3
-rw-r--r--man_action.c1
-rw-r--r--man_macro.c1
-rw-r--r--man_term.c1
-rw-r--r--man_validate.c43
-rw-r--r--mandoc.c2
8 files changed, 49 insertions, 6 deletions
diff --git a/libman.h b/libman.h
index be8e4369..4596a63c 100644
--- a/libman.h
+++ b/libman.h
@@ -49,6 +49,7 @@ enum merr {
WNODATA,
WNOTITLE,
WESCAPE,
+ WNUMFMT,
WERRMAX
};
diff --git a/man.c b/man.c
index e9bb7a56..8184dfef 100644
--- a/man.c
+++ b/man.c
@@ -34,6 +34,7 @@ const char *const __man_merrnames[WERRMAX] = {
"document has no body", /* WNODATA */
"document has no title/section", /* WNOTITLE */
"invalid escape sequence", /* WESCAPE */
+ "invalid number format", /* WNUMFMT */
};
const char *const __man_macronames[MAN_MAX] = {
@@ -42,7 +43,7 @@ const char *const __man_macronames[MAN_MAX] = {
"IP", "HP", "SM", "SB",
"BI", "IB", "BR", "RB",
"R", "B", "I", "IR",
- "RI", "na", "i"
+ "RI", "na", "i", "sp"
};
const char * const *man_macronames = __man_macronames;
diff --git a/man.h b/man.h
index 066fa354..55284253 100644
--- a/man.h
+++ b/man.h
@@ -42,7 +42,8 @@
#define MAN_RI 20
#define MAN_na 21
#define MAN_i 22
-#define MAN_MAX 23
+#define MAN_sp 23
+#define MAN_MAX 24
enum man_type {
MAN_TEXT,
diff --git a/man_action.c b/man_action.c
index 1bb775f3..71f8dc3c 100644
--- a/man_action.c
+++ b/man_action.c
@@ -59,6 +59,7 @@ const struct actions man_actions[MAN_MAX] = {
{ NULL }, /* RI */
{ NULL }, /* na */
{ NULL }, /* i */
+ { NULL }, /* sp */
};
diff --git a/man_macro.c b/man_macro.c
index df723e5e..1532b9c5 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -51,6 +51,7 @@ static int man_flags[MAN_MAX] = {
FL_NLINE, /* RI */
0, /* na */
FL_NLINE, /* i */
+ 0, /* sp */
};
int
diff --git a/man_term.c b/man_term.c
index 58f6f277..c211f43c 100644
--- a/man_term.c
+++ b/man_term.c
@@ -81,6 +81,7 @@ static const struct termact termacts[MAN_MAX] = {
{ pre_RI, NULL }, /* RI */
{ NULL, NULL }, /* na */
{ pre_I, post_I }, /* i */
+ { NULL, NULL }, /* sp */
};
static void print_head(struct termp *,
diff --git a/man_validate.c b/man_validate.c
index 183d31c5..442bad54 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -18,6 +18,8 @@
#include <assert.h>
#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -33,19 +35,22 @@ struct man_valid {
};
static int check_eq0(POSTARGS);
+static int check_eq1(POSTARGS);
static int check_ge1(POSTARGS);
static int check_ge2(POSTARGS);
static int check_le1(POSTARGS);
static int check_le2(POSTARGS);
static int check_le5(POSTARGS);
-static int check_text(POSTARGS);
static int check_root(POSTARGS);
+static int check_sp(POSTARGS);
+static int check_text(POSTARGS);
-static v_post posts_le1[] = { check_le1, NULL };
-static v_post posts_le2[] = { check_le2, NULL };
-static v_post posts_ge1[] = { check_ge1, NULL };
static v_post posts_eq0[] = { check_eq0, NULL };
+static v_post posts_ge1[] = { check_ge1, NULL };
static v_post posts_ge2_le5[] = { check_ge2, check_le5, NULL };
+static v_post posts_le1[] = { check_le1, NULL };
+static v_post posts_le2[] = { check_le2, NULL };
+static v_post posts_sp[] = { check_sp, NULL };
static const struct man_valid man_valids[MAN_MAX] = {
{ posts_eq0 }, /* br */
@@ -71,6 +76,7 @@ static const struct man_valid man_valids[MAN_MAX] = {
{ NULL }, /* RI */
{ posts_eq0 }, /* na */
{ NULL }, /* i */
+ { posts_sp }, /* sp */
};
@@ -162,9 +168,38 @@ check_##name(POSTARGS) \
}
INEQ_DEFINE(0, ==, eq0)
+INEQ_DEFINE(1, ==, eq1)
INEQ_DEFINE(1, >=, ge1)
INEQ_DEFINE(2, >=, ge2)
INEQ_DEFINE(1, <=, le1)
INEQ_DEFINE(2, <=, le2)
INEQ_DEFINE(5, <=, le5)
+
+static int
+check_sp(POSTARGS)
+{
+ long lval;
+ char *ep, *buf;
+
+ if (NULL == m->last->child)
+ return(1);
+ else if ( ! check_eq1(m, n))
+ return(0);
+
+ assert(MAN_TEXT == m->last->child->type);
+ buf = m->last->child->string;
+ assert(buf);
+
+ /* From OpenBSD's strtol(3). */
+ errno = 0;
+ lval = strtol(buf, &ep, 10);
+ if (buf[0] == '\0' || *ep != '\0')
+ return(man_nerr(m, m->last->child, WNUMFMT));
+
+ if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+ (lval > INT_MAX || lval < 0))
+ return(man_nerr(m, m->last->child, WNUMFMT));
+
+ return(1);
+}
diff --git a/mandoc.c b/mandoc.c
index 20bd5c88..0ec1d573 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -59,6 +59,8 @@ mandoc_special(const char *p)
/* FALLTHROUGH */
case (':'):
/* FALLTHROUGH */
+ case ('c'):
+ return(2);
case ('e'):
return(2);
case ('f'):