Improve messages related to the roff(7) .so request.

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index b47c5e1041d155f12116876dba898a6c4b6bd152..c4edcc3252930949f01813bd177e83a0b6b1ded0 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.50 2014/06/20 23:02:31 schwarze Exp $ */
+/*     $Id: read.c,v 1.52 2014/06/25 00:20:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -206,11 +206,12 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "child violates parent syntax",
        "argument count wrong, violates syntax",
        "NOT IMPLEMENTED: .so with absolute path or \"..\"",
+       ".so request failed",
        "no document prologue",
        "static buffer exhausted",
 
        /* system errors */
-       "cannot open file",
+       NULL,
        "cannot stat file",
        "cannot read file",
 };
@@ -506,8 +507,12 @@ rerun:
                        if (curp->secondary)
                                curp->secondary->sz -= pos + 1;
                        mparse_readfd(curp, -1, ln.buf + of);
-                       if (MANDOCLEVEL_FATAL <= curp->file_status)
+                       if (MANDOCLEVEL_FATAL <= curp->file_status) {
+                               mandoc_vmsg(MANDOCERR_SO_FAIL,
+                                   curp, curp->line, pos,
+                                   ".so %s", ln.buf + of);
                                break;
+                       }
                        pos = 0;
                        continue;
                default: