(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.74

version 1.71.6.3, 2007/09/12 16:18:48 version 1.74, 2007/11/30 01:16:33
Line 39 
Line 39 
 #include <Executor/Match.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 76 
Line 76 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
       // If a file exists that has the same case as the path parmater,
       // then we can bypass the expensive directory scanning below.
   
       if (FileSystem::exists(path))
       {
           realPath = path;
           return true;
       }
   
   
     realPath.clear();     realPath.clear();
     CString cpath = _clonePath(path);     CString cpath = _clonePath(path);
     const char* p = cpath;     const char* p = cpath;
Line 449 
Line 459 
 #elif defined(PEGASUS_OS_DARWIN) #elif defined(PEGASUS_OS_DARWIN)
     fileName = String("lib") + libraryName + String(".dylib");     fileName = String("lib") + libraryName + String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
     fileName = String("lib") + libraryName;      fileName = String("lib") + libraryName + String(".exe");
 #else #else
     fileName = String("lib") + libraryName + String(".so");     fileName = String("lib") + libraryName + String(".so");
 #endif #endif
Line 486 
Line 496 
     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 514 
     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 554 
 #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 603 
Line 582 
             if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)             if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
                 continue;                 continue;
  
             if (Match(name, pattern) == 0)              if (Match(pattern, name) == 0)
                 filenames.append(name);                 filenames.append(name);
         }         }
     }     }
     catch (...)      catch (CannotOpenDirectory&)
     {  
         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 false;
     }     }
  


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2