mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 07:24:27 +01:00
Code

copy.c: copy_fd - correctly report write errors

Browse Source 
Previously, the errno could have been lost due to an intervening
close() call.

This patch also contains minor cosmetic changes.

Signed-off-by: Ariel Badichi <abadichi@bezeqint.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ariel Badichi 2008-04-23 04:05:29 +03:00 committed by Junio C Hamano
parent 82881b3823
commit 8b1f6de854
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
copy.c
View File

@ -9,8 +9,7 @@ int copy_fd(int ifd, int ofd)
if (!len)
break;
if (len < 0) {
int read_error;
read_error = errno;
int read_error = errno;
close(ifd);
return error("copy-fd: read returned %s",
strerror(read_error));
@ -25,9 +24,10 @@ int copy_fd(int ifd, int ofd)
close(ifd);
return error("copy-fd: write returned 0");
} else {
int write_error = errno;
close(ifd);
return error("copy-fd: write returned %s",
strerror(errno));
strerror(write_error));
}
}
}
@ -48,7 +48,7 @@ int copy_file(const char *dst, const char *src, int mode)
}
status = copy_fd(fdi, fdo);
if (close(fdo) != 0)
return error("%s: write error: %s", dst, strerror(errno));
return error("%s: close error: %s", dst, strerror(errno));
if (!status && adjust_shared_perm(dst))
return -1;