Changeset 3291

Timestamp:

04/02/07 09:58:47 (6 years ago)

Author:

balister

Message:

FileSystem::list passes JTAP.

Files:

• ossie/branches/philip-work/framework/FileSystem_impl.cpp (modified) (1 diff)

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

@@ -150 +150 @@
             DEBUG(9, FileSystem, "In list checking file " << itr->leaf());
 
-            if (fnmatch(searchPattern.c_str(), itr->leaf().c_str(), 0)) {
+            if (fnmatch(searchPattern.c_str(), itr->leaf().c_str(), 0) == 0) {
                 DEBUG(9, FileSystem, "Match in list with " << itr->leaf());
 
                 result->length(idx + 1);
-                fs::path foundPath(filePath.branch_path() / itr->leaf());
-                result[idx].name = CORBA::string_dup(foundPath.string().c_str());
-                if (fs::is_directory(*itr))
+                if (fs::is_directory(*itr)) {
+                    std::string tmp(itr->leaf());
+                    tmp += "/";
+                    result[idx].name = CORBA::string_dup(tmp.c_str());
                     result[idx].kind = CF::FileSystem::DIRECTORY;
-                else
+                    result[idx].size = 0;
+                } else {
+                    result[idx].name = CORBA::string_dup(itr->leaf().c_str());
                     result[idx].kind = CF::FileSystem::PLAIN;
-                
-                result[idx].size = fs::file_size(*itr);
+                    result[idx].size = fs::file_size(*itr);
+                }
+
                 
                 /// \todo fix file creation time and last access time