mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CFileHelpers: remove 'doCopyFlag' -- it's always true anyway

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-27 11:33:55 +01:00
parent 87c0c55b85
commit 7625d7782c
2 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/system/helpers.cpp
View File

@@ -390,7 +390,6 @@ CFileHelpers::CFileHelpers()
{ {
FileBufSize = 0xFFFF; FileBufSize = 0xFFFF;
FileBuf = new char[FileBufSize]; FileBuf = new char[FileBufSize];
doCopyFlag = true;
} }
CFileHelpers::~CFileHelpers() CFileHelpers::~CFileHelpers()
@@ -409,7 +408,6 @@ CFileHelpers* CFileHelpers::getInstance()
bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode) bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
{ {
doCopyFlag = true;
unlink(Dst); unlink(Dst);
if ((fd1 = open(Src, O_RDONLY)) < 0) if ((fd1 = open(Src, O_RDONLY)) < 0)
return false; return false;
@@ -431,17 +429,13 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
read(fd1, FileBuf, block); read(fd1, FileBuf, block);
write(fd2, FileBuf, block); write(fd2, FileBuf, block);
fsize64 -= block; fsize64 -= block;
if (!doCopyFlag)
break;
} }
if (doCopyFlag) { lseek64(fd2, 0, SEEK_SET);
lseek64(fd2, 0, SEEK_SET); off64_t fsizeDst64 = lseek64(fd2, 0, SEEK_END);
off64_t fsizeDst64 = lseek64(fd2, 0, SEEK_END); if (fsizeSrc64 != fsizeDst64){
if (fsizeSrc64 != fsizeDst64){ close(fd1);
close(fd1); close(fd2);
close(fd2); return false;
return false;
}
} }
} }
else { // < 2GB else { // < 2GB
@@ -456,28 +450,18 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
read(fd1, FileBuf, block); read(fd1, FileBuf, block);
write(fd2, FileBuf, block); write(fd2, FileBuf, block);
fsize -= block; fsize -= block;
if (!doCopyFlag)
break;
} }
if (doCopyFlag) { lseek(fd2, 0, SEEK_SET);
lseek(fd2, 0, SEEK_SET); off_t fsizeDst = lseek(fd2, 0, SEEK_END);
off_t fsizeDst = lseek(fd2, 0, SEEK_END); if (fsizeSrc != fsizeDst){
if (fsizeSrc != fsizeDst){ close(fd1);
close(fd1); close(fd2);
close(fd2); return false;
return false;
}
} }
} }
close(fd1); close(fd1);
close(fd2); close(fd2);
if (!doCopyFlag) {
sync();
unlink(Dst);
return false;
}
chmod(Dst, mode); chmod(Dst, mode);
return true; return true;
} }

1
src/system/helpers.h
View File

@@ -62,7 +62,6 @@ class CFileHelpers
CFileHelpers(); CFileHelpers();
~CFileHelpers(); ~CFileHelpers();
static CFileHelpers* getInstance(); static CFileHelpers* getInstance();
bool doCopyFlag;
bool copyFile(const char *Src, const char *Dst, mode_t mode); bool copyFile(const char *Src, const char *Dst, mode_t mode);
bool copyDir(const char *Src, const char *Dst, bool backupMode=false); bool copyDir(const char *Src, const char *Dst, bool backupMode=false);