diff options
author | Jim Meyering <meyering@redhat.com> | 2011-01-30 16:12:56 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-01-30 20:44:12 +0100 |
commit | fc3c8e3cdd60d57762c3f274aa449915403171cd (patch) | |
tree | ab85567a0a00870ae5f169f66756fe876dd11136 | |
parent | 54602c76a0376152933e6b0702a0fc557993a929 (diff) | |
download | coreutils-fc3c8e3cdd60d57762c3f274aa449915403171cd.tar.xz |
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
-rw-r--r-- | src/copy.c | 2 | ||||
-rw-r--r-- | src/tee.c | 2 |
2 files changed, 0 insertions, 4 deletions
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; } @@ -183,10 +183,8 @@ tee_files (int nfiles, const char **files) while (1) { bytes_read = read (0, buffer, sizeof buffer); -#ifdef EINTR if (bytes_read < 0 && errno == EINTR) continue; -#endif if (bytes_read <= 0) break; |