(file) Return to FileSystem.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/FileSystem.cpp between version 1.71.6.1 and 1.71.6.3

version 1.71.6.1, 2007/09/11 16:32:42 version 1.71.6.3, 2007/09/12 16:18:48
Line 36 
Line 36 
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/AutoPtr.h> #include <Pegasus/Common/AutoPtr.h>
   #include <Executor/Match.h>
 #include "FileSystem.h" #include "FileSystem.h"
 #include "Dir.h" #include "Dir.h"
 #if !defined(PEGASUS_OS_TYPE_WINDOWS) && !defined(PEGASUS_OS_VXWORKS) #if !defined(PEGASUS_OS_TYPE_WINDOWS) && !defined(PEGASUS_OS_VXWORKS)
Line 497 
Line 498 
     const String& fileName,     const String& fileName,
     const String& userName)     const String& userName)
 { {
     // ATTN-MEB: fix!      // ATTN-MEB: revisit!
     assert(0);  
       if (userName == PEGASUS_VXWORKS_USER)
           return true;
   
     return false;     return false;
 } }
  
Line 581 
Line 585 
 #endif #endif
 } }
  
   Boolean FileSystem::glob(
       const String& path,
       const String& pattern_,
       Array<String>& filenames)
   {
       filenames.clear();
   
       try
       {
           CString pattern(pattern_.getCString());
   
           for (Dir dir(path); dir.more(); dir.next())
           {
               const char* name = dir.getName();
   
               if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
                   continue;
   
               if (Match(name, pattern) == 0)
                   filenames.append(name);
           }
       }
       catch (...)
       {
           return false;
       }
   
       return true;
   }
   
   Boolean FileSystem::removeMatchingFiles(
       const String& path, const String& pattern)
   {
   
       Array<String> filenames;
   
       if (!FileSystem::glob(path, pattern, filenames))
           return false;
   
       for (size_t i = 0; i < filenames.size(); i++)
       {
           if (!FileSystem::removeFile(filenames[i]))
               return false;
       }
   
       return true;
   }
   
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.71.6.1  
changed lines
  Added in v.1.71.6.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2