gbranden pushed a commit to branch master
in repository groff.
commit 372155264ca71c29f5170608995a77bb0b1dad2a
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Mar 2 23:59:43 2025 -0600
[troff]: Fix Savannah #66863 (`cf`, `trf` broken).
* src/roff/troff/input.cpp (copy_file, transparent_file): Drop
extraneous `tok.next()` calls; they are already performed just prior
to function return. They caused the input stream pointer to advance
too far.
Fixes <https://savannah.gnu.org/bugs/?66863>. Problem introduced by me
in commit f087165933, 7 December.
---
ChangeLog | 10 ++++++++++
src/roff/troff/input.cpp | 2 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 21822139f..dafc3875f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2025-03-02 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (copy_file, transparent_file): Drop
+ extraneous `tok.next()` calls; they are already performed just
+ prior to function return. They caused the input stream pointer
+ to advance too far.
+
+ Fixes <https://savannah.gnu.org/bugs/?66863>. Problem
+ introduced by me in commit f087165933, 7 December.
+
2025-03-02 G. Branden Robinson <[email protected]>
[groff]: Regression-test Savannah #66863.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 20d14a102..4faf6f287 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -8689,7 +8689,6 @@ void copy_file()
return;
}
char *filename = read_string();
- tok.next();
if (want_break)
curenv->do_break();
if (filename != 0 /* nullptr */)
@@ -8733,7 +8732,6 @@ void transparent_file()
return;
}
char *filename = read_string();
- tok.next();
if (want_break)
curenv->do_break();
if (filename != 0 /* nullptr */) {
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
