From: Jim Meyering <jim@meyering.net>
Date: Tue, 23 Sep 2003 17:47:59 +0000 (+0000)
Subject: (paste_serial): Save errno after input error,
X-Git-Tag: v5.1.0~548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3f05cf720073b01960be0ea389158937d81801d;p=thirdparty%2Fcoreutils.git

(paste_serial): Save errno after input error,
to report proper errno value.
Based on a patch from Paul Eggert.
---

diff --git a/src/paste.c b/src/paste.c
index 5ddb16f454..1f6a98101d 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -328,6 +328,7 @@ paste_serial (int nfiles, char **fnamptr)
 
   for (; nfiles; nfiles--, fnamptr++)
     {
+      int saved_errno;
       if (STREQ (*fnamptr, "-"))
 	{
 	  have_read_stdin = 1;
@@ -347,6 +348,7 @@ paste_serial (int nfiles, char **fnamptr)
       delimptr = delims;	/* Set up for delimiter string. */
 
       charold = getc (fileptr);
+      saved_errno = errno;
       if (charold != EOF)
 	{
 	  /* `charold' is set up.  Hit it!
@@ -371,6 +373,7 @@ paste_serial (int nfiles, char **fnamptr)
 
 	      charold = charnew;
 	    }
+	  saved_errno = errno;
 
 	  /* Hit EOF.  Process that last character. */
 	  putc (charold, stdout);
@@ -381,7 +384,7 @@ paste_serial (int nfiles, char **fnamptr)
 
       if (ferror (fileptr))
 	{
-	  error (0, errno, "%s", *fnamptr);
+	  error (0, saved_errno, "%s", *fnamptr);
 	  errors = 1;
 	}
       if (fileptr == stdin)