gbranden pushed a commit to branch master
in repository groff.
commit 7a00f970215381647cbfefaf4e438e9248b788cd
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Oct 17 08:28:39 2026 -0500
[troff]: Improve diagnostic messages.
* src/roff/troff/input.cpp (pipe_source_request, pipe_output)
(system_request): Use more consistent wording when diagnosing input
validity problems.
---
ChangeLog | 8 ++++++++
src/roff/troff/input.cpp | 12 ++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e10ae577c..168c14813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-10-17 G. Branden Robinson <[email protected]>
+
+ [troff]: Improve diagnostic messages.
+
+ * src/roff/troff/input.cpp (pipe_source_request, pipe_output)
+ (system_request): Use more consistent wording when diagnosing
+ input validity problems.
+
2026-10-17 G. Branden Robinson <[email protected]>
[troff]: Fix Savannah #68786.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 7ae4aae4e..242a7334a 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -7701,20 +7701,20 @@ static void source_quietly_request() // .soquiet
static void pipe_source_request() // .pso
{
if (!has_arg(true /* peeking */)) {
- warning(WARN_MISSING, "piped command source request expects"
+ warning(WARN_MISSING, "piped command sourcing request expects"
" arguments");
skip_line();
return;
}
if (!want_unsafe_requests) {
- error("piped command source request is not allowed in safer mode");
+ error("piped command sourcing request is not allowed in safer mode");
skip_line();
return;
}
char *pcmd = read_rest_of_line_as_argument();
if (0 /* nullptr */ == pcmd) {
- error("cannot apply piped command source request to empty"
- " argument");
+ error("cannot apply piped command sourcing request"
+ " to empty argument");
tok.next();
return;
}
@@ -9652,7 +9652,7 @@ static void pipe_output() // .pi
}
char *pc = read_rest_of_line_as_argument();
if (0 /* nullptr */ == pc)
- error("cannot apply pipe request to empty command");
+ error("cannot apply pipe request to empty argument");
// Are we adding to an existing pipeline?
if (pipe_command != 0 /* nullptr */) {
// ISO C++ does not permit VLAs on the stack.
@@ -9692,7 +9692,7 @@ static void system_request() // .sy
}
char *command = read_rest_of_line_as_argument();
if (0 /* nullptr */ == command)
- error("cannot apply system request to empty command");
+ error("cannot apply system request to empty argument");
else
system_status = system(command);
delete[] command;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
