diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-02-09 16:00:07 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-02-09 16:00:07 +0000 |
| commit | 09811b7b447c2eb6535d228df9cb39e296246eb8 (patch) | |
| tree | 646f5d255157689357b8480f618ab6200e980613 | |
| parent | 54def1f9e712d2931177ea733513d37c2d81f8a0 (diff) | |
ignore empty request lines in the table data reader;
fixing a minibug reported by bentley@
| -rw-r--r-- | usr.bin/mandoc/tbl_data.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/usr.bin/mandoc/tbl_data.c b/usr.bin/mandoc/tbl_data.c index 1bbb9c71f29..2aeaab0e978 100644 --- a/usr.bin/mandoc/tbl_data.c +++ b/usr.bin/mandoc/tbl_data.c @@ -1,7 +1,7 @@ -/* $OpenBSD: tbl_data.c,v 1.38 2018/12/14 05:17:45 schwarze Exp $ */ +/* $OpenBSD: tbl_data.c,v 1.39 2019/02/09 16:00:06 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 @@ -246,14 +246,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; + } } /* |