diff options
| author | bigbiff bigbiff <bigbiff@teamw.in> | 2013-01-21 18:02:40 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@5.9.244.119> | 2013-01-21 18:02:40 +0100 |
| commit | 9d880030d683a28ff90c823e7dcb42f0a3bbcf66 (patch) | |
| tree | e00d9441ef1f474c9965d7b045dd85f293b6e6b1 | |
| parent | change fuse to be compiled with TW_INCLUDE_FUSE_EXFAT (diff) | |
| parent | Remove sockets and FIFOS when removing files (diff) | |
| download | android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar.gz android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar.bz2 android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar.lz android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar.xz android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.tar.zst android_bootable_recovery-9d880030d683a28ff90c823e7dcb42f0a3bbcf66.zip | |
| -rw-r--r-- | partition.cpp | 2 | ||||
| -rw-r--r-- | twrp-functions.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/partition.cpp b/partition.cpp index 291f6baa5..d16ed7c74 100644 --- a/partition.cpp +++ b/partition.cpp @@ -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()); } diff --git a/twrp-functions.cpp b/twrp-functions.cpp index d7596b8a0..edf4898b1 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -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()); |