[groff] 01/01: [troff]: Mitigate Savannah #66164.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit cbfa5a07c882065eb2a99e4d1dc6ea79034ec6e1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Sep 3 11:03:47 2024 -0500

    [troff]: Mitigate Savannah #66164.
    
    * src/roff/troff/input.cpp (pipe_output, system_request): Fix requests I
      broke in commit 5f2704d64a, yesterday.  Thanks to Deri James for the
      report.
    
    Begins fixing <https://savannah.gnu.org/bugs/?66164>.  (We need
    regression tests.)
---
 ChangeLog                | 9 +++++++++
 src/roff/troff/env.cpp   | 1 +
 src/roff/troff/input.cpp | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9c35ffe2..38df83a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/input.cpp (pipe_output, system_request): Fix
+       requests I broke in commit 5f2704d64a, yesterday.  Thanks to
+       Deri James for the report.
+
+       Begins fixing <https://savannah.gnu.org/bugs/?66164>.  (We need
+       regression tests.)
+
 2024-09-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [troff]: Didja ever notice that `pnr` produces a lot of output,
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 263325701..6083ca5a2 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -1323,6 +1323,7 @@ void point_size()
   skip_line();
 }
 
+// TODO: .psizes
 void override_sizes()
 {
   if (!has_arg()) {
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index a9a380c26..4b5fa9616 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -8172,7 +8172,7 @@ char *read_string()
 
 void pipe_output()
 {
-  if (!has_arg()) {
+  if (!has_arg(true /* peek */)) {
     warning(WARN_MISSING, "device-independent output piping request"
            " expects a system command as argument");
     skip_line();
@@ -8217,7 +8217,7 @@ static int system_status;
 
 void system_request()
 {
-  if (!has_arg()) {
+  if (!has_arg(true /* peek */)) {
     warning(WARN_MISSING, "system command execution request expects a"
            " system command as argument");
     skip_line();