summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/man.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2010-10-16 20:49:37 +0000
committerschwarze <schwarze@openbsd.org>2010-10-16 20:49:37 +0000
commitf29deb813c7320a16d860faa6b8062713b53fd23 (patch)
tree36587e4bb1200d2e42beb9b4562f071134e236ad /usr.bin/mandoc/man.c
parentupdate struct statfs; from Vladimir Kirillov (diff)
downloadwireguard-openbsd-f29deb813c7320a16d860faa6b8062713b53fd23.tar.xz
wireguard-openbsd-f29deb813c7320a16d860faa6b8062713b53fd23.zip
Do not abort() on tbl errors, reduce the risk that tbl stuff kills a build,
and provide more useful tbl error messages in a non-intrusive way.
Diffstat (limited to 'usr.bin/mandoc/man.c')
-rw-r--r--usr.bin/mandoc/man.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c
index f981ae68d5d..9f43b074228 100644
--- a/usr.bin/mandoc/man.c
+++ b/usr.bin/mandoc/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.42 2010/10/15 21:33:47 schwarze Exp $ */
+/* $Id: man.c,v 1.43 2010/10/16 20:49:37 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -135,8 +135,10 @@ man_parseln(struct man *m, int ln, char *buf, int offs)
if (n && MAN_TS == n->tok && MAN_BODY == n->type &&
strncmp(buf+offs, ".TE", 3)) {
n = n->parent;
- return(tbl_read(n->data.TS, "<man>", ln, buf+offs,
- strlen(buf+offs)) ? 1 : 0);
+ if ( ! tbl_read(n->data.TS, "man tbl parser",
+ ln, buf+offs, strlen(buf+offs)))
+ man_nmsg(m, n, MANDOCERR_TBL);
+ return(1);
}
return(('.' == buf[offs] || '\'' == buf[offs]) ?