Make rcpputils::fs functions to behave like std::filesystem ones.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · Jan 14, 2020 · 449e1a4 · 449e1a4
1 parent 6ac7378
commit 449e1a4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/include/rcpputils/filesystem_helper.hpp b/include/rcpputils/filesystem_helper.hpp
@@ -194,7 +194,7 @@ inline bool create_directories(const path & p)
 #ifdef _WIN32
       status = _mkdir(p_built.string().c_str());
 #else
-      status = mkdir(p_built.string().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+      status = mkdir(p_built.string().c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
 #endif
     }
   }
@@ -204,9 +204,18 @@ inline bool create_directories(const path & p)
 inline bool remove(const path & p)
 {
 #ifdef _WIN32
-  return _rmdir(p.string().c_str()) == 0;
+  struct _stat s;
+  if (_stat(p.string().c_str(), &s) == 0) {
+    if (s.st_mode & S_IFDIR) {
+      return _rmdir(p.string().c_str()) == 0;
+    }
+    if (s.st_mode & S_IFREG) {
+      return ::remove(p.string().c_str()) == 0;
+    }
+  }
+  return false;
 #else
-  return rmdir(p.string().c_str()) == 0;
+  return ::remove(p.string().c_str()) == 0;
 #endif
 }
 

diff --git a/test/test_filesystem_helper.cpp b/test/test_filesystem_helper.cpp
@@ -14,6 +14,7 @@
 
 #include <gtest/gtest.h>
 
+#include <fstream>
 #include <string>
 
 #include "rcpputils/filesystem_helper.hpp"
@@ -150,20 +151,26 @@ TEST(TestFilesystemHelper, is_empty)
 }
 
 /**
- * Test directory manipulation API.
+ * Test filesystem manipulation API.
  *
  * NOTE: expects the current directory to be write-only, else test will fail.
  *
  */
-TEST(TestFilesystemHelper, directory_manipulation)
+TEST(TestFilesystemHelper, filesystem_manipulation)
 {
-  auto p = path(build_directory_path());
-  (void)rcpputils::fs::remove(p);
-  EXPECT_FALSE(rcpputils::fs::exists(p));
-  EXPECT_TRUE(rcpputils::fs::create_directories(p));
-  EXPECT_TRUE(rcpputils::fs::exists(p));
-  EXPECT_TRUE(rcpputils::fs::remove(p));
-  EXPECT_FALSE(rcpputils::fs::exists(p));
+  auto dir = path(build_directory_path());
+  (void)rcpputils::fs::remove(dir);
+  EXPECT_FALSE(rcpputils::fs::exists(dir));
+  EXPECT_TRUE(rcpputils::fs::create_directories(dir));
+  EXPECT_TRUE(rcpputils::fs::exists(dir));
+  auto file = dir / "test_file.txt";
+  std::ofstream(file.string()) << "test";
+  EXPECT_TRUE(rcpputils::fs::exists(file));
+  EXPECT_FALSE(rcpputils::fs::remove(dir));
+  EXPECT_TRUE(rcpputils::fs::remove(file));
+  EXPECT_TRUE(rcpputils::fs::remove(dir));
+  EXPECT_FALSE(rcpputils::fs::exists(file));
+  EXPECT_FALSE(rcpputils::fs::exists(dir));
 }
 
 TEST(TestFilesystemHelper, remove_extension)