From: Tom Tromey <tom@tromey.com>
Date: Sat, 20 Jan 2018 23:53:12 +0000 (-0700)
Subject: exit inner copying loop at the start of a new file entry
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eba8dbcbe547b19cd44250fbc3f996052ae48239;p=emacs.git

exit inner copying loop at the start of a new file entry
---

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 92cc190f3e6..1fa0447791b 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1680,21 +1680,21 @@ static void
 copy_entries_from_old_file (FILE *old_file, const char *old_filename, FILE *out_file)
 {
   linebuffer line;
+  bool keep_going = true;
 
   need_filebuf = false;
 
   linebuffer_init (&line);
-  while (true)
+
+  if (readline_internal (&line, old_file, old_filename) <= 0
+      || line.len < 1 || !strneq (line.buffer, "\f", 1))
+    goto error;
+
+  while (keep_going)
     {
       char *comma, *filename;
       bool should_copy;
 
-      if (readline_internal (&line, old_file, old_filename) <= 0)
-	break;
-
-      if (line.len < 1 || !strneq (line.buffer, "\f", 1))
-	goto error;
-
       if (readline_internal (&line, old_file, old_filename) <= 0)
 	goto error;
 
@@ -1716,13 +1716,19 @@ copy_entries_from_old_file (FILE *old_file, const char *old_filename, FILE *out_
       while (true)
 	{
 	  if (readline_internal (&line, old_file, old_filename) <= 0)
-	    break;
+	    {
+	      keep_going = false;
+	      break;
+	    }
 
 	  if (should_copy)
 	    {
 	      fwrite (line.buffer, line.len, 1, out_file);
 	      fputs ("\n", out_file);
 	    }
+
+	  if (line.len < 0 || strneq (line.buffer, "\f", 1))
+	    break;
 	}
     }