From bb81e5d02df38c940709bc7416ea84620add889a Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 20 Mar 2014 18:05:41 -0500 Subject: Remove deprecated tar exclude functionality twrpDU::check_skip_dirs() handles skipped folders now. Everywhere twrpTar::setexcl() is being used to exclude files eventually calls createTarFork(), which in turn calls Generate_TarList(), which checks check_skip_dirs(). Change-Id: Ibbc4eb2eb89863ccb2a15f5a3b5092fb10fcbcc0 --- twrpTar.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'twrpTar.cpp') diff --git a/twrpTar.cpp b/twrpTar.cpp index 0dff14d89..b053c08d4 100644 --- a/twrpTar.cpp +++ b/twrpTar.cpp @@ -67,10 +67,6 @@ void twrpTar::setdir(string dir) { tardir = dir; } -void twrpTar::setexcl(string exclude) { - tarexclude.push_back(exclude); -} - void twrpTar::setsize(unsigned long long backup_size) { Total_Backup_Size = backup_size; } @@ -447,7 +443,6 @@ int twrpTar::Generate_TarList(string Path, std::vector *TarList, string FileName; struct TarListStruct TarItem; string::size_type i; - bool skip; if (has_data_media == 1 && Path.size() >= 11 && strncmp(Path.c_str(), "/data/media", 11) == 0) return 0; // Skip /data/media @@ -459,20 +454,9 @@ int twrpTar::Generate_TarList(string Path, std::vector *TarList, return -1; } while ((de = readdir(d)) != NULL) { - // Skip excluded stuff FileName = Path + "/"; FileName += de->d_name; - if (tarexclude.size() > 0) { - skip = false; - for (i = 0; i < tarexclude.size(); i++) { - if (FileName == tarexclude[i]) { - LOGINFO("Excluding %s\n", FileName.c_str()); - break; - } - } - if (skip) - continue; - } + if (has_data_media == 1 && FileName.size() >= 11 && strncmp(FileName.c_str(), "/data/media", 11) == 0) continue; // Skip /data/media if (de->d_type == DT_BLK || de->d_type == DT_CHR) -- cgit v1.2.3