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

Merge branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent 8cd0502cc1 71637be190
commit 8baeccb8a1
40 changed files with 435 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/helpers.cpp
View File

@@ -37,6 +37,7 @@
#include <zapit/debug.h>
#include <system/helpers.h>
#include <gui/ext_update.h>
bool file_exists(const char *filename)
{
@@ -339,7 +340,7 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
return true;
}
bool CFileHelpers::copyDir(const char *Src, const char *Dst)
bool CFileHelpers::copyDir(const char *Src, const char *Dst, bool backupMode)
{
DIR *Directory;
struct dirent *CurrentFile;
@@ -402,7 +403,10 @@ bool CFileHelpers::copyDir(const char *Src, const char *Dst)
}
// is file
else if (S_ISREG(FileInfo.st_mode)) {
copyFile(srcPath, dstPath, FileInfo.st_mode & 0x0FFF);
std::string save = "";
if (backupMode && (CExtUpdate::getInstance()->isBlacklistEntry(srcPath)))
save = ".save";
copyFile(srcPath, (dstPath + save).c_str(), FileInfo.st_mode & 0x0FFF);
}
}
}