PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove sockets and FIFOS when removing files" into twrp2.4

Browse Source
This commit is contained in:
bigbiff bigbiff
2013-01-21 11:02:40 -06:00
committed by Gerrit Code Review
parent 31f0e5fa22 98f1f903cc
commit 9d880030d6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
partition.cpp
+1 -1
View File
@@ -1234,7 +1234,7 @@ bool TWPartition::Wipe_Data_Without_Wiping_Media() {
dir.append(de->d_name);
if (de->d_type == DT_DIR) {
TWFunc::removeDir(dir, false);
} else if (de->d_type == DT_REG || de->d_type == DT_LNK) {
} else if (de->d_type == DT_REG || de->d_type == DT_LNK || de->d_type == DT_FIFO || de->d_type == DT_SOCK) {
if (!unlink(dir.c_str()))
LOGI("Unable to unlink '%s'\n", dir.c_str());
}
twrp-functions.cpp
+1 -1
View File
@@ -426,7 +426,7 @@ int TWFunc::removeDir(const string path, bool skipParent) {
else
LOGI("Unable to removeDir '%s': %s\n", new_path.c_str(), strerror(errno));
}
} else if (p->d_type == DT_REG || p->d_type == DT_LNK) {
} else if (p->d_type == DT_REG || p->d_type == DT_LNK || p->d_type == DT_FIFO || p->d_type == DT_SOCK) {
r = unlink(new_path.c_str());
if (!r)
LOGI("Unable to unlink '%s'\n", new_path.c_str());