From 3fdcda46629e8e7fc19e89c51350b1e6f151e05e Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 30 Nov 2016 12:29:37 -0600 Subject: Improve backup & wipe exclusion handling Rename twrpDU.* to exclude.* Remove global variable for du and replace with partition specific variables. Use separate exclusion lists for backups and wiping. Clean up some includes Fix some parenthesis in twrp.cpp that I messed up. Note: twrpTarMain command line utility compiles but probably does not work correctly yet due to not properly setting part_settings Change-Id: Idec9c3e6a8782ba53f3420fa79ba33394f4f85fb --- twrpDU.cpp | 115 ------------------------------------------------------------- 1 file changed, 115 deletions(-) delete mode 100644 twrpDU.cpp (limited to 'twrpDU.cpp') diff --git a/twrpDU.cpp b/twrpDU.cpp deleted file mode 100644 index 08dfdcbea..000000000 --- a/twrpDU.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - Copyright 2013 TeamWin - This file is part of TWRP/TeamWin Recovery Project. - - TWRP is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - TWRP is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with TWRP. If not, see . -*/ - -extern "C" { - #include "libtar/libtar.h" -} -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "twrpDU.hpp" -#include "twrp-functions.hpp" -#include "gui/gui.hpp" - -using namespace std; - -extern bool datamedia; - -twrpDU::twrpDU() { - add_relative_dir("."); - add_relative_dir(".."); - add_relative_dir("lost+found"); - add_absolute_dir("/data/data/com.google.android.music/files"); -} - -void twrpDU::add_relative_dir(const string& dir) { - relativedir.push_back(dir); -} - -void twrpDU::clear_relative_dir(string dir) { - vector::iterator iter = relativedir.begin(); - while (iter != relativedir.end()) { - if (*iter == dir) - iter = relativedir.erase(iter); - else - iter++; - } -} - -void twrpDU::add_absolute_dir(const string& dir) { - absolutedir.push_back(TWFunc::Remove_Trailing_Slashes(dir)); -} - -vector twrpDU::get_absolute_dirs(void) { - return absolutedir; -} - -uint64_t twrpDU::Get_Folder_Size(const string& Path) { - DIR* d; - struct dirent* de; - struct stat st; - uint64_t dusize = 0; - string FullPath; - - d = opendir(Path.c_str()); - if (d == NULL) { - gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(Path)(strerror(errno))); - return 0; - } - - while ((de = readdir(d)) != NULL) { - FullPath = Path + "/"; - FullPath += de->d_name; - if (lstat(FullPath.c_str(), &st)) { - gui_msg(Msg(msg::kError, "error_opening_strerr=Error opening: '{1}' ({2})")(FullPath)(strerror(errno))); - LOGINFO("Real error: Unable to stat '%s'\n", FullPath.c_str()); - continue; - } - if ((st.st_mode & S_IFDIR) && !check_skip_dirs(FullPath) && de->d_type != DT_SOCK) { - dusize += Get_Folder_Size(FullPath); - } else if (st.st_mode & S_IFREG) { - dusize += (uint64_t)(st.st_size); - } - } - closedir(d); - return dusize; -} - -bool twrpDU::check_relative_skip_dirs(const string& dir) { - return std::find(relativedir.begin(), relativedir.end(), dir) != relativedir.end(); -} - -bool twrpDU::check_absolute_skip_dirs(const string& path) { - return std::find(absolutedir.begin(), absolutedir.end(), path) != absolutedir.end(); -} - -bool twrpDU::check_skip_dirs(const string& path) { - string normalized = TWFunc::Remove_Trailing_Slashes(path); - size_t slashIdx = normalized.find_last_of('/'); - if(slashIdx != std::string::npos && slashIdx+1 < normalized.size()) { - if(check_relative_skip_dirs(normalized.substr(slashIdx+1))) - return true; - } - return check_absolute_skip_dirs(normalized); -} -- cgit v1.2.3