(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.4 and 1.77.4.2

version 1.71.6.4, 2007/09/19 21:35:29 version 1.77.4.2, 2008/12/02 06:25:57
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 !defined(PEGASUS_OS_VMS) && !defined(PEGASUS_OS_TYPE_WINDOWS)
   
       // 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;
       }
   
   #endif
   
     realPath.clear();     realPath.clear();
     CString cpath = _clonePath(path);     CString cpath = _clonePath(path);
     const char* p = cpath;     const char* p = cpath;
Line 444 
Line 457 
     //     //
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     fileName = libraryName + String(".dll");     fileName = libraryName + String(".dll");
   #else
       fileName = String("lib") + libraryName + getDynamicLibraryExtension();
   #endif
       return fileName;
   }
   
   String FileSystem::getDynamicLibraryExtension()
   {
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
       return String(".dll");
 #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)
     fileName = String("lib") + libraryName + String(".sl");      return String(".sl");
 #elif defined(PEGASUS_OS_DARWIN) #elif defined(PEGASUS_OS_DARWIN)
     fileName = String("lib") + libraryName + String(".dylib");      return String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
     fileName = String("lib") + libraryName;      return String(".exe");
 #else #else
     fileName = String("lib") + libraryName + String(".so");      return String(".so");
 #endif #endif
   
     return fileName;  
 } }
  
   
 Boolean GetLine(PEGASUS_STD(istream)& is, String& line) Boolean GetLine(PEGASUS_STD(istream)& is, String& line)
 { {
     line.clear();     line.clear();
Line 486 
Line 506 
     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 532 
Line 522 
     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");
  
     struct passwd* userPasswd;     struct passwd* userPasswd;
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \  #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined (PEGASUS_OS_LINUX)      defined(PEGASUS_OS_LINUX) || \
       defined (PEGASUS_OS_VMS) || \
       defined (PEGASUS_OS_AIX)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd pwd;     struct passwd pwd;
     struct passwd *result;  
     char pwdBuffer[PWD_BUFF_SIZE];     char pwdBuffer[PWD_BUFF_SIZE];
  
     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,
Line 573 
Line 564 
 #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 607 
Line 596 
                 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.4  
changed lines
  Added in v.1.77.4.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2