From fc3c8e3cdd60d57762c3f274aa449915403171cd Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 30 Jan 2011 16:12:56 +0100
Subject: copy, tee: assume EINTR is always defined: remove #ifdefs

Don't use "#ifdef EINTR".  dd.c has been doing that since 2004.
* src/copy.c (sparse_copy): Remove #ifdef...#endif around EINTR use.
* src/tee.c (tee_files): Remove #ifdef...#endif around EINTR use.
If we need it, add something like this in system.h:
/* When EINTR is not defined, define it to an improbable value
   so that each use does not have to be #ifdef'd.  */
 #ifndef EINTR
 # define EINTR 999988
 #endif
---
 src/copy.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/copy.c')

diff --git a/src/copy.c b/src/copy.c
index 96bb35b13..4e73e1b87 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -160,10 +160,8 @@ sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
       ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
       if (n_read < 0)
         {
-#ifdef EINTR
           if (errno == EINTR)
             continue;
-#endif
           error (0, errno, _("reading %s"), quote (src_name));
           return false;
         }
-- 
cgit v1.2.3