(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.3 and 1.72

version 1.71.6.3, 2007/09/12 16:18:48 version 1.72, 2007/09/11 19:47:08
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)  #ifndef PEGASUS_OS_TYPE_WINDOWS
 #include <pwd.h> #include <pwd.h>
 #endif #endif
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
Line 486 
Line 485 
     return gotChar;     return gotChar;
 } }
  
 //==============================================================================  
 //  
 // PEGASUS_OS_VXWORKS  
 //  
 //==============================================================================  
   
 #if defined(PEGASUS_OS_VXWORKS)  
   
 Boolean FileSystem::changeFileOwner(  
     const String& fileName,  
     const String& userName)  
 {  
     // ATTN-MEB: revisit!  
   
     if (userName == PEGASUS_VXWORKS_USER)  
         return true;  
   
     return false;  
 }  
   
 #endif /* defined(PEGASUS_OS_VXWORKS) */  
   
 //==============================================================================  
 //  
 // !PEGASUS_OS_VXWORKS  
 //  
 //==============================================================================  
   
 #if !defined(PEGASUS_OS_VXWORKS)  
   
 // //
 // changes the file owner to one specified // changes the file owner to one specified
 // //
Line 534 
Line 503 
     struct passwd* userPasswd;     struct passwd* userPasswd;
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \ #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined (PEGASUS_OS_LINUX)      defined(PEGASUS_OS_LINUX) || \
       defined (PEGASUS_OS_VMS)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd pwd;     struct passwd pwd;
Line 573 
Line 543 
 #endif #endif
 } }
  
 #endif /* !defined(PEGASUS_OS_VXWORKS) */  
   
 void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)& fs) void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)& fs)
 { {
 #if defined(PEGASUS_OS_HPUX) #if defined(PEGASUS_OS_HPUX)
Line 585 
Line 553 
 #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.3  
changed lines
  Added in v.1.72

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2