mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
00b7cbfcb3
When copy_fd() function encounters errors, it emits error messages itself, which makes it impossible for callers to take responsibility for reporting errors, especially when they want to ignore certain errors. Move the error reporting to its callers in preparation. - copy_file() and copy_file_with_time() by indirection get their own calls to error(). - hold_lock_file_for_append(), when told to die on error, used to exit(128) relying on the error message from copy_fd(), but now it does its own die() instead. Note that the callers that do not pass LOCK_DIE_ON_ERROR need to be adjusted for this change, but fortunately there is none ;-) - filter_buffer_or_fd() has its own error() already, in addition to the message from copy_fd(), so this will change the output but arguably in a better way. Signed-off-by: Junio C Hamano <gitster@pobox.com>
67 lines
1.3 KiB
C
67 lines
1.3 KiB
C
#include "cache.h"
|
|
|
|
int copy_fd(int ifd, int ofd)
|
|
{
|
|
while (1) {
|
|
char buffer[8192];
|
|
ssize_t len = xread(ifd, buffer, sizeof(buffer));
|
|
if (!len)
|
|
break;
|
|
if (len < 0)
|
|
return COPY_READ_ERROR;
|
|
if (write_in_full(ofd, buffer, len) < 0)
|
|
return COPY_WRITE_ERROR;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int copy_times(const char *dst, const char *src)
|
|
{
|
|
struct stat st;
|
|
struct utimbuf times;
|
|
if (stat(src, &st) < 0)
|
|
return -1;
|
|
times.actime = st.st_atime;
|
|
times.modtime = st.st_mtime;
|
|
if (utime(dst, ×) < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
int copy_file(const char *dst, const char *src, int mode)
|
|
{
|
|
int fdi, fdo, status;
|
|
|
|
mode = (mode & 0111) ? 0777 : 0666;
|
|
if ((fdi = open(src, O_RDONLY)) < 0)
|
|
return fdi;
|
|
if ((fdo = open(dst, O_WRONLY | O_CREAT | O_EXCL, mode)) < 0) {
|
|
close(fdi);
|
|
return fdo;
|
|
}
|
|
status = copy_fd(fdi, fdo);
|
|
switch (status) {
|
|
case COPY_READ_ERROR:
|
|
error("copy-fd: read returned %s", strerror(errno));
|
|
break;
|
|
case COPY_WRITE_ERROR:
|
|
error("copy-fd: write returned %s", strerror(errno));
|
|
break;
|
|
}
|
|
close(fdi);
|
|
if (close(fdo) != 0)
|
|
return error("%s: close error: %s", dst, strerror(errno));
|
|
|
|
if (!status && adjust_shared_perm(dst))
|
|
return -1;
|
|
|
|
return status;
|
|
}
|
|
|
|
int copy_file_with_time(const char *dst, const char *src, int mode)
|
|
{
|
|
int status = copy_file(dst, src, mode);
|
|
if (!status)
|
|
return copy_times(dst, src);
|
|
return status;
|
|
}
|