From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 17 Oct 2018 20:36:35 +0000 (-0400)
Subject: Save/restore line number to fix error line reporting.
X-Git-Tag: v2.3b6~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2064e071b09946c58b8c5ec4dd66a8813a10b4c8;p=thirdparty%2Fcups.git

Save/restore line number to fix error line reporting.
---

diff --git a/test/ipptool.c b/test/ipptool.c
index 1e59fa96e9..cf919b3034 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -3786,6 +3786,7 @@ token_cb(_ipp_file_t      *f,		/* I - IPP file data */
 	     !_cups_strcasecmp(token, "WITH-VALUE"))
     {
       off_t	lastpos;		/* Last file position */
+      int	lastline;		/* Last line number */
 
       if (data->last_expect)
       {
@@ -3815,8 +3816,9 @@ token_cb(_ipp_file_t      *f,		/* I - IPP file data */
 
       for (;;)
       {
-        lastpos = cupsFileTell(f->fp);
-        ptr     += strlen(ptr);
+        lastpos  = cupsFileTell(f->fp);
+        lastline = f->linenum;
+        ptr      += strlen(ptr);
 
 	if (!_ippFileReadToken(f, ptr, (sizeof(temp) - (size_t)(ptr - temp))))
 	  break;
@@ -3839,6 +3841,7 @@ token_cb(_ipp_file_t      *f,		/* I - IPP file data */
           */
 
           cupsFileSeek(f->fp, lastpos);
+          f->linenum = lastline;
           *ptr = '\0';
           break;
 	}