picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

copy: make copy_bytes() return whether we hit EOF or not

Browse source
This commit is contained in:
Lennart Poettering 2015-09-17 01:20:56 +02:00
parent c622fbdb8d
commit f6d9c616b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/basic/copy.c
View file

@ -44,7 +44,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) {
r = btrfs_reflink(fdf, fdt); r = btrfs_reflink(fdf, fdt);
if (r >= 0) if (r >= 0)
return r; return 0; /* we copied the whole thing, hence hit EOF, return 0 */
} }
for (;;) { for (;;) {
@ -54,7 +54,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) {
if (max_bytes != (uint64_t) -1) { if (max_bytes != (uint64_t) -1) {
if (max_bytes <= 0) if (max_bytes <= 0)
return -EFBIG; return 1; /* return > 0 if we hit the max_bytes limit */
if ((uint64_t) m > max_bytes) if ((uint64_t) m > max_bytes)
m = (size_t) max_bytes; m = (size_t) max_bytes;
@ -79,7 +79,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) {
/* The try splice, unless we already tried */ /* The try splice, unless we already tried */
if (try_splice) { if (try_splice) {
n = splice(fdf, NULL, fdt, NULL, m, 0); n = splice(fdf, NULL, fdt, NULL, m, 0);
if (n < 0) { if (n < 0) {
if (errno != EINVAL && errno != ENOSYS) if (errno != EINVAL && errno != ENOSYS)
return -errno; return -errno;
@ -95,7 +95,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) {
/* As a fallback just copy bits by hand */ /* As a fallback just copy bits by hand */
{ {
char buf[m]; uint8_t buf[m];
n = read(fdf, buf, m); n = read(fdf, buf, m);
if (n < 0) if (n < 0)
@ -115,7 +115,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) {
} }
} }
return 0; return 0; /* return 0 if we hit EOF earlier than the size limit */
} }
static int fd_copy_symlink(int df, const char *from, const struct stat *st, int dt, const char *to) { static int fd_copy_symlink(int df, const char *from, const struct stat *st, int dt, const char *to) {