ICE-7019 - remove db tools dependency on IcePatch2

2 files changed, 44 insertions, 0 deletions

diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index ea7fc606e65..dfcbf670b5c 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -17,8 +17,12 @@
 #ifdef _WIN32
 #  include <process.h>
 #  include <io.h>
+#  ifndef ICE_OS_WINRT
+#    include <Shlwapi.h>
+#  endif
 #else
 #  include <unistd.h>
+#  include <dirent.h>
 #endif
 
 using namespace std;
@@ -90,6 +94,41 @@ IceUtilInternal::directoryExists(const string& path)
 }
 
 //
+// Determinte if a directory exists and is empty
+//
+#ifndef ICE_OS_WINRT
+bool
+IceUtilInternal::isEmptyDirectory(const string& path)
+{
+#   ifdef _WIN32
+    return PathIsDirectoryEmptyW(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+#   else
+    struct dirent* d;
+    DIR* dir = opendir(path.c_str());
+    if(dir)
+    {
+        bool empty = true;
+        while((d = readdir(dir)))
+        {
+            string name(d->d_name);
+            if(name != "." && name != "..")
+            {
+                empty = false;
+                break;
+            }
+        }
+        closedir(dir);
+        return empty;
+    }
+    else
+    {
+        return false;
+    }
+#   endif
+}
+#endif
+
+//
 // Determine if a regular file exists.
 //
 bool
diff --git a/cpp/src/IceUtil/FileUtil.h b/cpp/src/IceUtil/FileUtil.h
index 3b148f5dce4..8ff6af42406 100644
--- a/cpp/src/IceUtil/FileUtil.h
+++ b/cpp/src/IceUtil/FileUtil.h
@@ -40,6 +40,11 @@ ICE_UTIL_API bool fileExists(const std::string&);
 //
 ICE_UTIL_API bool directoryExists(const std::string&);
 
+//
+// Determinte if a directory exists and is empty
+//
+ICE_UTIL_API bool isEmptyDirectory(const std::string&);
+
 #ifdef _WIN32
 
 #if defined(__MINGW32__)