(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.64 and 1.77.6.1

version 1.64, 2006/10/03 15:28:22 version 1.77.6.1, 2008/08/20 23:05:49
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Mike Brasher (mbrasher@bmc.com)  
 //  
 // Modified By:  
 //         Ramnath Ravindran(Ramnath.Ravindran@compaq.com)  
 //         Amit K Arora, IBM (amita@in.ibm.com)  
 //         Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //         Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)  
 //         David Dillard, VERITAS Software Corp.  
 //             (david.dillard@veritas.com)  
 //         Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <iostream> #include <iostream>
Line 47 
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"
 #ifndef PEGASUS_OS_TYPE_WINDOWS #ifndef PEGASUS_OS_TYPE_WINDOWS
Line 86 
Line 76 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
 #ifdef PEGASUS_OS_OS400  #if !defined(PEGASUS_OS_VMS) && !defined(PEGASUS_OS_TYPE_WINDOWS)
     // The OS/400 file system is case insensitive, so just call exists( ).  
     // This is faster, but the main reason to do this is to      // If a file exists that has the same case as the path parmater,
     // avoid multi-threading problems with the IFS directory APIs      // then we can bypass the expensive directory scanning below.
     // (even though they claim to be threadsafe).  
       if (FileSystem::exists(path))
       {
     realPath = path;     realPath = path;
     return exists(path);          return true;
 #else      }
   
   #endif
   
     realPath.clear();     realPath.clear();
     CString cpath = _clonePath(path);     CString cpath = _clonePath(path);
     const char* p = cpath;     const char* p = cpath;
Line 135 
Line 130 
     }     }
  
     return false;     return false;
 #endif  
 } }
  
 Boolean FileSystem::canRead(const String& path) Boolean FileSystem::canRead(const String& path)
Line 268 
Line 262 
 #if defined(__GNUC__) && GCC_VERSION >= 30200 #if defined(__GNUC__) && GCC_VERSION >= 30200
     fs.open(_clonePath(realPath), PEGASUS_STD(ios_base::openmode)(mode));     fs.open(_clonePath(realPath), PEGASUS_STD(ios_base::openmode)(mode));
 #else #else
 #if defined(PEGASUS_OS_OS400)  
     fs.open(_clonePath(realPath), mode, PEGASUS_STD(_CCSID_T(1208)) );  
 #else  
     fs.open(_clonePath(realPath), mode);     fs.open(_clonePath(realPath), mode);
 #endif #endif
 #endif  
     return !!fs;     return !!fs;
 } }
  
Line 395 
Line 385 
 String  FileSystem::extractFileName(const String& path) String  FileSystem::extractFileName(const String& path)
 { {
   AutoArrayPtr<char> p_path(new char[path.size() + 1]);   AutoArrayPtr<char> p_path(new char[path.size() + 1]);
   String basename = System::extract_file_name((const char *)path.getCString(), p_path.get());      String basename = System::extract_file_name(
           (const char*)path.getCString(), p_path.get());
  
   return basename;   return basename;
 } }
Line 404 
Line 395 
 String FileSystem::extractFilePath(const String& path) String FileSystem::extractFilePath(const String& path)
 { {
   AutoArrayPtr<char> p_path(new char[path.size() + 1]);   AutoArrayPtr<char> p_path(new char[path.size() + 1]);
   String newpath = System::extract_file_path((const char *)path.getCString(), p_path.get());      String newpath = System::extract_file_path(
           (const char*)path.getCString(), p_path.get());
  
   return newpath;   return newpath;
 } }
Line 412 
Line 404 
 // Changes file permissions on the given file. // Changes file permissions on the given file.
 Boolean FileSystem::changeFilePermissions(const String& path, mode_t mode) Boolean FileSystem::changeFilePermissions(const String& path, mode_t mode)
 { {
 #if defined(PEGASUS_OS_OS400)  
     // ATTN: If getCString() is modified to return UTF8, then handle the  
     //       EBCDIC coversion in SystemUnix.cpp  
     CString tempPath = path.getCString();     CString tempPath = path.getCString();
 #else  
     CString tempPath = path.getCString();  
 #endif  
  
     return System::changeFilePermissions(tempPath, mode);     return System::changeFilePermissions(tempPath, mode);
 } }
  
 String FileSystem::getAbsoluteFileName(const String &paths, const String &filename) {  String FileSystem::getAbsoluteFileName(
       const String& paths,
       const String& filename)
   {
   Uint32 pos =0;   Uint32 pos =0;
   Uint32 token=0;   Uint32 token=0;
   String path = String::EMPTY;      String path;
   String root = String::EMPTY;      String root;
   String tempPath = paths;   String tempPath = paths;
  
       do
   do {      {
     if (( pos = tempPath.find(FileSystem::getPathDelimiter())) == PEG_NOT_FOUND) {          if ((pos = tempPath.find(FileSystem::getPathDelimiter())) ==
               PEG_NOT_FOUND)
           {
                 pos = tempPath.size();                 pos = tempPath.size();
                 token = 0;                 token = 0;
         }         }
         else {          else
           {
                 token = 1;                 token = 1;
         }         }
         path = tempPath.subString(0, pos);         path = tempPath.subString(0, pos);
         tempPath.remove(0,pos+token);         tempPath.remove(0,pos+token);
         if (FileSystem::exists( path + "/" + filename) == true) {          if (FileSystem::exists(path + "/" + filename) == true)
           {
           root = path + "/" + filename;           root = path + "/" + filename;
           break;           break;
         } else          }
           else
           {           {
           //  cout << "File does not exist.\n";           //  cout << "File does not exist.\n";
           }           }
Line 464 
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_OS400)  
     fileName = libraryName;  
 #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 511 
Line 509 
 // //
 // changes the file owner to one specified // changes the file owner to one specified
 // //
 Boolean FileSystem::changeFileOwner(const String& fileName,const String& userName)  Boolean FileSystem::changeFileOwner(
       const String& fileName,
       const String& userName)
 { {
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
  
Line 522 
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)
  
     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 537 
Line 537 
     userPasswd=(struct passwd *)NULL;     userPasswd=(struct passwd *)NULL;
     }     }
  
 #elif defined(PEGASUS_OS_OS400)  
     CString tempName = userName.getCString();  
     const char * tmp = tempName;  
     AtoE((char *)tmp);  
     userPasswd = getpwnam(tmp);  
 #else #else
  
     userPasswd = getpwnam(userName.getCString());     userPasswd = getpwnam(userName.getCString());
Line 550 
Line 545 
     if ( userPasswd  == NULL)     if ( userPasswd  == NULL)
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return (false);          return false;
     }     }
  
 #if defined(PEGASUS_OS_OS400)      Sint32 ret = chown(
     CString tempPath = fileName.getCString();          fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);
     const char * tmp1 = tempPath;  
     AtoE((char *)tmp1);  
     Sint32 ret = chown(tmp1, userPasswd->pw_uid, userPasswd->pw_gid);  
 #else  
     Sint32 ret = chown(fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);  
 #endif  
     if ( ret == -1)     if ( ret == -1)
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return (false);          return false;
     }     }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
     return (true);      return true;
   #endif
   }
   
   void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)& fs)
   {
   #if defined(PEGASUS_OS_HPUX)
       // Writes the data from the iostream buffers to the OS buffers
       fs.flush();
       // Writes the data from the OS buffers to the disk
       fsync(fs.rdbuf()->fd());
 #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(pattern, name) == 0)
                   filenames.append(name);
           }
       }
       catch (CannotOpenDirectory&)
       {
           return false;
       }
   
       return true;
   }
   
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.77.6.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2