Changeset 3269

Timestamp:

03/31/07 14:58:51 (6 years ago)

Author:

balister

Message:

Pass some more test.

Location:

ossie/branches/philip-work/framework

Files:

• FileManager_impl.cpp (modified) (2 diffs)
• FileSystem_impl.cpp (modified) (3 diffs)

ossie/branches/philip-work/framework/FileManager_impl.cpp

@@ -24 +24 @@
 #include <string>
 
+#include <boost/filesystem/path.hpp>
+
 #include "ossie/cf.h"
 #include "ossie/FileManager_impl.h"
@@ -30 +32 @@
 FileManager_impl::FileManager_impl ():FileSystem_impl ()
 {
-    DEBUG(4, FileManager, "Entering constructor.")
+    DEBUG(4, FileManager, "Entering constructor.");
+
+    if (boost::filesystem::path::default_name_check_writable())
+        boost::filesystem::path::default_name_check(boost::filesystem::portable_posix_name);
+
     numMounts = 0;
     mount_table = new CF::FileManager::MountSequence(5);

ossie/branches/philip-work/framework/FileSystem_impl.cpp

@@ -35 +35 @@
 {
     DEBUG(6, FileSystem, "In constructor.");
+
+    if (boost::filesystem::path::default_name_check_writable())
+        boost::filesystem::path::default_name_check(boost::filesystem::portable_posix_name);
 
     root = boost::filesystem::initial_path();
@@ -219 +222 @@
     boost::filesystem::path dirPath(root / directoryName);
 
-    ///\todo Create entire path when needed.
-    try {
-        boost::filesystem::create_directory(dirPath);
-    } catch (...) {
-        throw CF::FileException (CF::CFENFILE, "[FileSystem::mkdir] Failed to create directory");
-    }
-
-}
-
+    boost::filesystem::path::iterator walkPath(dirPath.begin());
+    boost::filesystem::path currentPath;
+    while (walkPath != dirPath.end()) {
+        DEBUG(9, FileSystem, "Walking path to create directories, current path " << currentPath.string());
+        currentPath /= *walkPath;
+        if (!boost::filesystem::exists(currentPath)) {
+            DEBUG(9, FileSystem, "Creating directory " << currentPath.string());
+            try {
+                boost::filesystem::create_directory(currentPath);
+            } catch (...) {
+                throw CF::FileException (CF::CFENFILE, "[FileSystem::mkdir] Failed to create directory");
+            }
+        }
+        ++walkPath;
+    }
+}
 
 void FileSystem_impl::rmdir (const char *directoryName) throw (CORBA::SystemException, CF::FileException, CF::InvalidFileName)
@@ -240 +250 @@
     boost::filesystem::path dirPath(root / directoryName);
 
-    boost::filesystem::remove(dirPath);
-
-#if 0///\todo Generate proper exceptions
-    if (check != 0)
-        throw CF::FileException (CF::CFENFILE,
-            "[FileSystem_impl::rmdir] Failed to remove directory\n");
-#endif
+    ///\todo Fix case where directory contains only other empty directories
+    try {
+        boost::filesystem::remove(dirPath);
+    } catch (...) {
+    }
 }