projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shrink "struct object" a bit
[git.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
e1cd5d0
..
08a3d38
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-6,32
+6,30
@@
int copy_fd(int ifd, int ofd)
int len;
char buffer[8192];
char *buf = buffer;
int len;
char buffer[8192];
char *buf = buffer;
- len = read(ifd, buffer, sizeof(buffer));
+ len =
x
read(ifd, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0) {
int read_error;
if (!len)
break;
if (len < 0) {
int read_error;
- if (errno == EAGAIN)
- continue;
read_error = errno;
close(ifd);
return error("copy-fd: read returned %s",
strerror(read_error));
}
read_error = errno;
close(ifd);
return error("copy-fd: read returned %s",
strerror(read_error));
}
- while (
1
) {
- int written = write(ofd, buf, len);
+ while (
len
) {
+ int written =
x
write(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);
}
}
close(ifd);