diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-08-18 11:22:02 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-08-18 11:22:02 +0000 |
| commit | e2384e44b3213551c4ea3de2e9b54f1a39eeb708 (patch) | |
| tree | 27853313eac66267f6845d2701dddf640705cd8d /usr/src/cmd/mandoc/tbl_data.c | |
| parent | 2284cf450f099ce8441493d7c9f2c1cb0bbf474f (diff) | |
| parent | 371584c2eae4cf827fd406ba26c14f021adaaa70 (diff) | |
| download | illumos-joyent-e2384e44b3213551c4ea3de2e9b54f1a39eeb708.tar.gz | |
[illumos-gate merge]
commit 371584c2eae4cf827fd406ba26c14f021adaaa70
7243 update mdocml to 1.13.4
commit 7a8b8fd18ff115f0caa89183db5373afb568b630
5166 sendmail package should be replaceable (followup)
Diffstat (limited to 'usr/src/cmd/mandoc/tbl_data.c')
| -rw-r--r-- | usr/src/cmd/mandoc/tbl_data.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/cmd/mandoc/tbl_data.c b/usr/src/cmd/mandoc/tbl_data.c index e2be64eb81..40b756a05e 100644 --- a/usr/src/cmd/mandoc/tbl_data.c +++ b/usr/src/cmd/mandoc/tbl_data.c @@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.39 2015/01/30 17:32:16 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.41 2015/10/06 18:32:20 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -132,11 +132,12 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) if (p[pos] == tbl->opts.tab) { tbl->part = TBL_PART_DATA; pos++; - getdata(tbl, tbl->last_span, ln, p, &pos); - return(1); + while (p[pos] != '\0') + getdata(tbl, tbl->last_span, ln, p, &pos); + return 1; } else if (p[pos] == '\0') { tbl->part = TBL_PART_DATA; - return(1); + return 1; } /* Fallthrough: T} is part of a word. */ @@ -156,7 +157,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, ln, pos, dat->string); - return(0); + return 0; } static struct tbl_span * @@ -177,7 +178,7 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) dp->prev->next = dp; tbl->last_span = dp; - return(dp); + return dp; } void |