index 20092757d395dfa4af99a6062e5e2cc0fa5e00c3..c225d1b0ff0a67e637f7200ab5c2a917b550af4f 100644 (file)
--- a/copy.c
+++ b/copy.c
int copy_fd(int ifd, int ofd)
{
while (1) {
int copy_fd(int ifd, int ofd)
{
while (1) {
- int len;
char buffer[8192];
char *buf = buffer;
char buffer[8192];
char *buf = buffer;
- len = read(ifd, buffer, sizeof(buffer));
+ ssize_t len = xread(ifd, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0) {
if (!len)
break;
if (len < 0) {
- if (errno == EAGAIN)
- continue;
+ int read_error;
+ read_error = errno;
+ close(ifd);
return error("copy-fd: read returned %s",
return error("copy-fd: read returned %s",
- strerror(errno));
+ strerror(read_error));
}
}
- while (1) {
- int written = write(ofd, buf, len);
+ while (len) {
+ int written = xwrite(ofd, buf, len);
if (written > 0) {
buf += written;
len -= written;
if (written > 0) {
buf += written;
len -= written;
- if (!len)
- break;
}
}
- if (!written)
+ else if (!written) {
+ close(ifd);
return error("copy-fd: write returned 0");
return error("copy-fd: write returned 0");
- if (errno == EAGAIN || errno == EINTR)
- continue;
- return error("copy-fd: write returned %s",
- strerror(errno));
+ } else {
+ close(ifd);
+ return error("copy-fd: write returned %s",
+ strerror(errno));
+ }
}
}
close(ifd);
return 0;
}
}
}
close(ifd);
return 0;
}
-