grep branch, master, updated. v2.12-15-g2665746

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  2665746b756bd372ba856e165388dc98032362fd (commit)
      from  34e0adabf0cd98eb4d1c4a929acf0b8238fcfbbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2665746b756bd372ba856e165388dc98032362fd


commit 2665746b756bd372ba856e165388dc98032362fd
Author: Paul Eggert <address@hidden>
Date:   Fri Jun 1 08:04:44 2012 -0700

    grep: remove unnecessary "what-if-signal?" code
    
    * src/main.c (fillbuf): Don't worry about EINTR when closing --
    not possible, since we're not catching signals.

diff --git a/src/main.c b/src/main.c
index 10fbfac..dda7c9b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -601,7 +601,7 @@ reset (int fd, struct stat const *st)
 static int
 fillbuf (size_t save, struct stat const *st)
 {
-  size_t fillsize = 0;
+  ssize_t fillsize;
   int cc = 1;
   char *readbuf;
   size_t readsize;
@@ -662,18 +662,9 @@ fillbuf (size_t save, struct stat const *st)
   readsize = buffer + bufalloc - readbuf;
   readsize -= readsize % pagesize;
 
-  if (! fillsize)
-    {
-      ssize_t bytesread;
-      while ((bytesread = read (bufdesc, readbuf, readsize)) < 0
-             && errno == EINTR)
-        continue;
-      if (bytesread < 0)
-        cc = 0;
-      else
-        fillsize = bytesread;
-    }
-
+  fillsize = read (bufdesc, readbuf, readsize);
+  if (fillsize < 0)
+    fillsize = cc = 0;
   bufoffset += fillsize;
 #if defined HAVE_DOS_FILE_CONTENTS
   if (fillsize)

-----------------------------------------------------------------------

Summary of changes:
 src/main.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
grep