diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-06-25 00:20:19 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-06-25 00:20:19 +0000 |
| commit | 0b6903db7750adfcd88f388a0196037f91e474c6 (patch) | |
| tree | 74a7bb636324f8fbc42a2c5baf7d30fcf31df1cf /roff.c | |
| parent | ac2e8ee3f16b454077019e9f59ae2ff011411ae5 (diff) | |
| download | mandoc-0b6903db7750adfcd88f388a0196037f91e474c6.tar.gz mandoc-0b6903db7750adfcd88f388a0196037f91e474c6.tar.zst mandoc-0b6903db7750adfcd88f388a0196037f91e474c6.zip | |
Improve messages related to the roff(7) .so request.
In all these messages, show the filename argument that was passed
to the .so request.
In case of failure, show an additional message reporting the file
and the line number where the failing request was found.
The existing message reporting the reason for the failure -
for example, "Permission denied" - is left in place, unchanged.
Inspired by a question asked by Nick@ after he saw the
confusing old messages that used to be emitted in this area.
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.209 2014/04/23 16:08:33 schwarze Exp $ */ +/* $Id: roff.c,v 1.210 2014/06/25 00:20:19 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1938,7 +1938,8 @@ roff_so(ROFF_ARGS) { char *name; - mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL); + name = *bufp + pos; + mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, ".so %s", name); /* * Handle `so'. Be EXTREMELY careful, as we shouldn't be @@ -1947,9 +1948,9 @@ roff_so(ROFF_ARGS) * or using absolute paths. */ - name = *bufp + pos; if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) { - mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL); + mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos, + ".so %s", name); return(ROFF_ERR); } |