rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

better handle incomplete reads/writes in copying files

Browse source
This commit is contained in:
Antonio SJ Musumeci 2017-04-13 12:55:34 -04:00
parent f95b07f83b
commit ccaa458739
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/fs_clonefile.cpp
View file

@ -57,19 +57,18 @@ writen(const int fd,
ssize_t nwritten;
nleft = count;
while(nleft > 0)
do
{
nwritten = fs::write(fd,buf,nleft);
if((nwritten == -1) && (errno == EINTR))
continue;
if(nwritten == -1)
{
if(errno == EINTR)
continue;
return -1;
}
return -1;
nleft -= nwritten;
buf += nwritten;
}
while(nleft > 0);
return count;
}
@ -96,12 +95,12 @@ copyfile_rw(const int fdin,
while(totalwritten < count)
{
nr = fs::read(fdin,&buf[0],bufsize);
if(nr == 0)
return totalwritten;
if((nr == -1) && (errno == EINTR))
continue;
if(nr == -1)
{
if(errno == EINTR)
continue;
return -1;
}
return -1;
nw = writen(fdout,&buf[0],nr);
if(nw == -1)
@ -110,7 +109,7 @@ copyfile_rw(const int fdin,
totalwritten += nw;
}
return count;
return totalwritten;
}
static