summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mandoc/libman.h3
-rw-r--r--usr.bin/mandoc/man.c5
-rw-r--r--usr.bin/mandoc/man.h5
-rw-r--r--usr.bin/mandoc/man_action.c3
-rw-r--r--usr.bin/mandoc/man_macro.c3
-rw-r--r--usr.bin/mandoc/man_term.c3
-rw-r--r--usr.bin/mandoc/man_validate.c45
7 files changed, 54 insertions, 13 deletions
diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h
index 9d641d8bb52..32ca61a0d44 100644
--- a/usr.bin/mandoc/libman.h
+++ b/usr.bin/mandoc/libman.h
@@ -1,4 +1,4 @@
-/* $Id: libman.h,v 1.5 2009/07/12 20:30:27 schwarze Exp $ */
+/* $Id: libman.h,v 1.6 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -49,6 +49,7 @@ enum merr {
WNODATA,
WNOTITLE,
WESCAPE,
+ WNUMFMT,
WERRMAX
};
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c
index a5cefdcb058..abd8a02fd9b 100644
--- a/usr.bin/mandoc/man.c
+++ b/usr.bin/mandoc/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.7 2009/07/12 20:30:27 schwarze Exp $ */
+/* $Id: man.c,v 1.8 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -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/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h
index 4e747ba98d0..2c100eb2c4a 100644
--- a/usr.bin/mandoc/man.h
+++ b/usr.bin/mandoc/man.h
@@ -1,4 +1,4 @@
-/* $Id: man.h,v 1.5 2009/07/07 00:54:46 schwarze Exp $ */
+/* $Id: man.h,v 1.6 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -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/usr.bin/mandoc/man_action.c b/usr.bin/mandoc/man_action.c
index eb1ecd1e895..5dda9537a6f 100644
--- a/usr.bin/mandoc/man_action.c
+++ b/usr.bin/mandoc/man_action.c
@@ -1,4 +1,4 @@
-/* $Id: man_action.c,v 1.4 2009/06/23 22:05:42 schwarze Exp $ */
+/* $Id: man_action.c,v 1.5 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -55,6 +55,7 @@ const struct actions man_actions[MAN_MAX] = {
{ NULL }, /* RI */
{ NULL }, /* na */
{ NULL }, /* i */
+ { NULL }, /* sp */
};
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index 2b15e16bf7b..ae292d3213a 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.4 2009/06/23 22:05:42 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.5 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -51,6 +51,7 @@ static int man_flags[MAN_MAX] = {
FL_NLINE, /* RI */
0, /* na */
FL_NLINE, /* i */
+ 0, /* sp */
};
int
diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index a6bb92455b5..d8e03a60c34 100644
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.8 2009/06/23 22:43:30 schwarze Exp $ */
+/* $Id: man_term.c,v 1.9 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -76,6 +76,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/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c
index b09bec2af70..5cc8a914009 100644
--- a/usr.bin/mandoc/man_validate.c
+++ b/usr.bin/mandoc/man_validate.c
@@ -1,4 +1,4 @@
-/* $Id: man_validate.c,v 1.5 2009/07/08 00:04:10 schwarze Exp $ */
+/* $Id: man_validate.c,v 1.6 2009/08/22 15:15:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -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);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 00:57:44 +0000