aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-02-09 16:00:39 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-02-09 16:00:39 +0000
commit6e010d1175e0b79d1ce84b3d4fed64b2f489ef0f (patch)
treeada7994a97a75a48dcfc3e6a4004749b9c46ec4e
parent822ae1a5efc7b4f19845067290cd5f2b55b9bf70 (diff)
downloadmandoc-6e010d1175e0b79d1ce84b3d4fed64b2f489ef0f.tar.gz
mandoc-6e010d1175e0b79d1ce84b3d4fed64b2f489ef0f.tar.zst
mandoc-6e010d1175e0b79d1ce84b3d4fed64b2f489ef0f.zip
ignore empty request lines in the table data reader;
fixing a minibug reported by bentley@
-rw-r--r--tbl_data.c33
1 files changed, 23 insertions, 10 deletions
diff --git a/tbl_data.c b/tbl_data.c
index ecdf50a0..9a58d325 100644
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/* $Id: tbl_data.c,v 1.51 2018/12/14 05:18:03 schwarze Exp $ */
+/* $Id: tbl_data.c,v 1.52 2019/02/09 16:00:39 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2015,2017,2018,2019 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -248,14 +248,27 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
assert(rp != NULL);
- if ( ! strcmp(p, "_")) {
- sp = newspan(tbl, ln, rp);
- sp->pos = TBL_SPAN_HORIZ;
- return;
- } else if ( ! strcmp(p, "=")) {
- sp = newspan(tbl, ln, rp);
- sp->pos = TBL_SPAN_DHORIZ;
- return;
+ if (p[1] == '\0') {
+ switch (p[0]) {
+ case '.':
+ /*
+ * Empty request lines must be handled here
+ * and cannot be discarded in roff_parseln()
+ * because in the layout section, they
+ * are significant and end the layout.
+ */
+ return;
+ case '_':
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_HORIZ;
+ return;
+ case '=':
+ sp = newspan(tbl, ln, rp);
+ sp->pos = TBL_SPAN_DHORIZ;
+ return;
+ default:
+ break;
+ }
}
/*