From 648bd000a6a2923c619e38ca8c2d519611a41d7c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Mon, 27 Jan 2014 11:33:55 +0100
Subject: [PATCH] CFileHelpers: remove 'doCopyFlag' -- it's always true anyway

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/7625d7782c439d19f00e6a8ed71c98dead9e2d88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/system/helpers.cpp | 40 ++++++++++++----------------------------
 src/system/helpers.h   |  1 -
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index 609b67cbb..5f9373bbc 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -390,7 +390,6 @@ CFileHelpers::CFileHelpers()
 {
 	FileBufSize	= 0xFFFF;
 	FileBuf		= new char[FileBufSize];
-	doCopyFlag	= true;
 }
 
 CFileHelpers::~CFileHelpers()
@@ -409,7 +408,6 @@ CFileHelpers* CFileHelpers::getInstance()
 
 bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
 {
-	doCopyFlag = true;
 	unlink(Dst);
 	if ((fd1 = open(Src, O_RDONLY)) < 0)
 		return false;
@@ -431,17 +429,13 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
 			read(fd1, FileBuf, block);
 			write(fd2, FileBuf, block);
 			fsize64 -= block;
-			if (!doCopyFlag)
-				break;
 		}
-		if (doCopyFlag) {
-			lseek64(fd2, 0, SEEK_SET);
-			off64_t fsizeDst64 = lseek64(fd2, 0, SEEK_END);
-			if (fsizeSrc64 != fsizeDst64){
-				close(fd1);
-				close(fd2);
-				return false;
-			}
+		lseek64(fd2, 0, SEEK_SET);
+		off64_t fsizeDst64 = lseek64(fd2, 0, SEEK_END);
+		if (fsizeSrc64 != fsizeDst64){
+			close(fd1);
+			close(fd2);
+			return false;
 		}
 	}
 	else { // < 2GB
@@ -456,28 +450,18 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
 			read(fd1, FileBuf, block);
 			write(fd2, FileBuf, block);
 			fsize -= block;
-			if (!doCopyFlag)
-				break;
 		}
-		if (doCopyFlag) {
-			lseek(fd2, 0, SEEK_SET);
-			off_t fsizeDst = lseek(fd2, 0, SEEK_END);
-			if (fsizeSrc != fsizeDst){
-				close(fd1);
-				close(fd2);
-				return false;
-			}
+		lseek(fd2, 0, SEEK_SET);
+		off_t fsizeDst = lseek(fd2, 0, SEEK_END);
+		if (fsizeSrc != fsizeDst){
+			close(fd1);
+			close(fd2);
+			return false;
 		}
 	}
 	close(fd1);
 	close(fd2);
 
-	if (!doCopyFlag) {
-		sync();
-		unlink(Dst);
-		return false;
-	}
-
 	chmod(Dst, mode);
 	return true;
 }
diff --git a/src/system/helpers.h b/src/system/helpers.h
index ed9f191ff..b0623a56a 100644
--- a/src/system/helpers.h
+++ b/src/system/helpers.h
@@ -62,7 +62,6 @@ class CFileHelpers
 		CFileHelpers();
 		~CFileHelpers();
 		static CFileHelpers* getInstance();
-		bool doCopyFlag;
 
 		bool copyFile(const char *Src, const char *Dst, mode_t mode);
 		bool copyDir(const char *Src, const char *Dst, bool backupMode=false);