From f1408b3c0f9e45b4d080a9bd0c1e479c2067e872 Mon Sep 17 00:00:00 2001 From: that Date: Sun, 3 Jan 2016 11:09:15 +0100 Subject: Fix Recursive_Mkdir if path doesn't end with "/" Somewhat surprisingly, Recursive_Mkdir(TWRES "customlanguages") did not create the "customlanguages" directory because it expected a trailing slash. Fixed by rewriting the loop to be more like Create_Dir_Recursive. Also fixed error handling for the final directory, and fixed incorrect return value handling for "mkdir" ORS command. Change-Id: I1ab418ddda695cbb595a9db2817f00fc7b171f51 --- twrp-functions.cpp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'twrp-functions.cpp') diff --git a/twrp-functions.cpp b/twrp-functions.cpp index a7a8e8d63..6eb6cd59d 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -403,26 +403,19 @@ void TWFunc::htc_dumlock_reflash_recovery_to_boot(void) { } int TWFunc::Recursive_Mkdir(string Path) { - string pathCpy = Path; - string wholePath; - size_t pos = pathCpy.find("/", 2); - - while (pos != string::npos) - { - wholePath = pathCpy.substr(0, pos); - if (!TWFunc::Path_Exists(wholePath)) { - if (mkdir(wholePath.c_str(), 0777)) { - gui_msg(Msg(msg::kError, "create_folder_strerr=Can not create '{1}' folder ({2})")(wholePath)(strerror(errno))); + std::vector parts = Split_String(Path, "/", true); + std::string cur_path; + for (size_t i = 0; i < parts.size(); ++i) { + cur_path += "/" + parts[i]; + if (!TWFunc::Path_Exists(cur_path)) { + if (mkdir(cur_path.c_str(), 0777)) { + gui_msg(Msg(msg::kError, "create_folder_strerr=Can not create '{1}' folder ({2})")(cur_path)(strerror(errno))); return false; } else { - tw_set_default_metadata(wholePath.c_str()); + tw_set_default_metadata(cur_path.c_str()); } } - - pos = pathCpy.find("/", pos + 1); } - if (mkdir(wholePath.c_str(), 0777) && errno != EEXIST) - return false; return true; } -- cgit v1.2.3