commit 9d880030d683a28ff90c823e7dcb42f0a3bbcf66
author bigbiff bigbiff <bigbiff@teamw.in> Mon Jan 21 11:02:40 2013 -0600
committer Gerrit Code Review <gerrit@5.9.244.119> Mon Jan 21 11:02:40 2013 -0600
tree e00d9441ef1f474c9965d7b045dd85f293b6e6b1
parent 31f0e5fa22a878fc871c245782f388a7b9336436
parent 98f1f903cceee4a0c7a3693c6bd93825210cdf96

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

partition.cpp

diff --git a/partition.cpp b/partition.cpp
index 291f6ba..d16ed7c 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1234,7 +1234,7 @@
 			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

diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index d7596b8..edf4898 100644
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -426,7 +426,7 @@
 					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());