summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-25 16:44:51 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-07-25 16:44:51 +0200
commit32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112 (patch)
treecff74e879b13d5d0f7478ac14645ab68efa23b4f
parentMerge "roots.cpp: Reformatting the file." am: ac70ffcc85 am: 922a310d36 am: bba1e66f74 am: 11e6d8ee85 (diff)
parentMerge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 (diff)
downloadandroid_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar.gz
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar.bz2
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar.lz
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar.xz
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.tar.zst
android_bootable_recovery-32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112.zip
-rw-r--r--otautil/DirUtil.cpp56
-rw-r--r--otautil/DirUtil.h13
-rw-r--r--tests/unit/dirutil_test.cpp32
3 files changed, 0 insertions, 101 deletions
diff --git a/otautil/DirUtil.cpp b/otautil/DirUtil.cpp
index e08e360c0..ad344dedf 100644
--- a/otautil/DirUtil.cpp
+++ b/otautil/DirUtil.cpp
@@ -160,59 +160,3 @@ dirCreateHierarchy(const char *path, int mode,
}
return 0;
}
-
-int
-dirUnlinkHierarchy(const char *path)
-{
- struct stat st;
- DIR *dir;
- struct dirent *de;
- int fail = 0;
-
- /* is it a file or directory? */
- if (lstat(path, &st) < 0) {
- return -1;
- }
-
- /* a file, so unlink it */
- if (!S_ISDIR(st.st_mode)) {
- return unlink(path);
- }
-
- /* a directory, so open handle */
- dir = opendir(path);
- if (dir == NULL) {
- return -1;
- }
-
- /* recurse over components */
- errno = 0;
- while ((de = readdir(dir)) != NULL) {
- //TODO: don't blow the stack
- char dn[PATH_MAX];
- if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, ".")) {
- continue;
- }
- snprintf(dn, sizeof(dn), "%s/%s", path, de->d_name);
- if (dirUnlinkHierarchy(dn) < 0) {
- fail = 1;
- break;
- }
- errno = 0;
- }
- /* in case readdir or unlink_recursive failed */
- if (fail || errno < 0) {
- int save = errno;
- closedir(dir);
- errno = save;
- return -1;
- }
-
- /* close directory handle */
- if (closedir(dir) < 0) {
- return -1;
- }
-
- /* delete target directory */
- return rmdir(path);
-}
diff --git a/otautil/DirUtil.h b/otautil/DirUtil.h
index 85b83c387..beecc1081 100644
--- a/otautil/DirUtil.h
+++ b/otautil/DirUtil.h
@@ -17,13 +17,8 @@
#ifndef MINZIP_DIRUTIL_H_
#define MINZIP_DIRUTIL_H_
-#include <stdbool.h>
#include <utime.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct selabel_handle;
/* Like "mkdir -p", try to guarantee that all directories
@@ -43,12 +38,4 @@ int dirCreateHierarchy(const char *path, int mode,
const struct utimbuf *timestamp, bool stripFileName,
struct selabel_handle* sehnd);
-/* rm -rf <path>
- */
-int dirUnlinkHierarchy(const char *path);
-
-#ifdef __cplusplus
-}
-#endif
-
#endif // MINZIP_DIRUTIL_H_
diff --git a/tests/unit/dirutil_test.cpp b/tests/unit/dirutil_test.cpp
index 5e2ae4fb5..e62032c68 100644
--- a/tests/unit/dirutil_test.cpp
+++ b/tests/unit/dirutil_test.cpp
@@ -116,35 +116,3 @@ TEST(DirUtilTest, create_mode_and_timestamp) {
ASSERT_EQ(0, rmdir((prefix + "/a/b").c_str()));
ASSERT_EQ(0, rmdir((prefix + "/a").c_str()));
}
-
-TEST(DirUtilTest, unlink_invalid) {
- // File doesn't exist.
- ASSERT_EQ(-1, dirUnlinkHierarchy("doesntexist"));
-
- // Nonexistent directory.
- TemporaryDir td;
- std::string path(td.path);
- ASSERT_EQ(-1, dirUnlinkHierarchy((path + "/a").c_str()));
- ASSERT_EQ(ENOENT, errno);
-}
-
-TEST(DirUtilTest, unlink_smoke) {
- // Unlink a file.
- TemporaryFile tf;
- ASSERT_EQ(0, dirUnlinkHierarchy(tf.path));
- ASSERT_EQ(-1, access(tf.path, F_OK));
-
- TemporaryDir td;
- std::string path(td.path);
- constexpr mode_t mode = 0700;
- ASSERT_EQ(0, mkdir((path + "/a").c_str(), mode));
- ASSERT_EQ(0, mkdir((path + "/a/b").c_str(), mode));
- ASSERT_EQ(0, mkdir((path + "/a/b/c").c_str(), mode));
- ASSERT_EQ(0, mkdir((path + "/a/d").c_str(), mode));
-
- // Remove "../a" recursively.
- ASSERT_EQ(0, dirUnlinkHierarchy((path + "/a").c_str()));
-
- // Verify it's gone.
- ASSERT_EQ(-1, access((path + "/a").c_str(), F_OK));
-}