[groff] 11/23: [libgroff]: Revisit fix for Savannah #61173.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b973ff2ca8c9227c234069e6a304f628cf1a163c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Sep 23 11:50:11 2021 +1000

    [libgroff]: Revisit fix for Savannah #61173.
    
    * src/libs/libgroff/font.cpp (text_file::text_file): Restore setting of
      `lineno` member variable to `0` in constructor initializer list,
      but...
    
      (text_file::next_line): ...unconditionally increment it every time
      through this member function's outer loop.
---
 ChangeLog                  | 10 ++++++++++
 src/libs/libgroff/font.cpp |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c462327..780a137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2021-09-23  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       [libgroff]: Revisit fix for Savannah #61173.
+
+       * src/libs/libgroff/font.cpp (text_file::text_file): Restore
+       setting of `lineno` member variable to `0` in constructor
+       initializer list, but...
+       (text_file::next_line): ...unconditionally increment it every
+       time through this member function's outer loop.
+
+2021-09-23  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        [troff]: Align diagnostic message format with libgroff.
 
        * src/roff/troff/input.cpp (fatal_with_file_and_line): Report
diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
index bbbf432..283bca1 100644
--- a/src/libs/libgroff/font.cpp
+++ b/src/libs/libgroff/font.cpp
@@ -81,7 +81,7 @@ struct text_file {
             const errarg &arg3 = empty_errarg);
 };
 
-text_file::text_file(FILE *p, char *s) : fp(p), path(s), lineno(1),
+text_file::text_file(FILE *p, char *s) : fp(p), path(s), lineno(0),
   size(0), recognize_comments(true), silent(false), buf(0)
 {
 }
@@ -103,6 +103,7 @@ bool text_file::next_line()
     size = 128;
   }
   for (;;) {
+    lineno++;
     int i = 0;
     for (;;) {
       int c = getc(fp);