version 1.112, 2015/01/20 21:16:51 |
version 1.113, 2015/01/22 19:26:50 |
Line 307 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 307 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
{ |
{ |
const struct tbl_span *span; |
const struct tbl_span *span; |
struct buf ln; |
struct buf ln; |
|
const char *save_file; |
char *cp; |
char *cp; |
size_t pos; /* byte number in the ln buffer */ |
size_t pos; /* byte number in the ln buffer */ |
enum rofferr rr; |
enum rofferr rr; |
|
|
*/ |
*/ |
if (curp->secondary) |
if (curp->secondary) |
curp->secondary->sz -= pos + 1; |
curp->secondary->sz -= pos + 1; |
|
save_file = curp->file; |
save_child = curp->child; |
save_child = curp->child; |
if (mparse_open(curp, &fd, ln.buf + of) == |
if (mparse_open(curp, &fd, ln.buf + of) == |
MANDOCLEVEL_OK) |
MANDOCLEVEL_OK) { |
mparse_readfd(curp, fd, ln.buf + of); |
mparse_readfd(curp, fd, ln.buf + of); |
else { |
curp->file = save_file; |
|
} else { |
|
curp->file = save_file; |
mandoc_vmsg(MANDOCERR_SO_FAIL, |
mandoc_vmsg(MANDOCERR_SO_FAIL, |
curp, curp->line, pos, |
curp, curp->line, pos, |
".so %s", ln.buf + of); |
".so %s", ln.buf + of); |