(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.62.2.1 and 1.71.6.3

version 1.62.2.1, 2005/12/30 22:01:01 version 1.71.6.3, 2007/09/12 16:18:48
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 27 
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 45 
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)  #include <pwd.h>
 #define DIR_SEP "\\"  
 #else  
 #define DIR_SEP "/"  
 #endif #endif
   #include <Pegasus/Common/Tracer.h>
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 // Clone the path as a C String but discard trailing slash if any: // Clone the path as a C String but discard trailing slash if any:
Line 87 
Line 76 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
 #ifdef PEGASUS_OS_OS400  
     // The OS/400 file system is case insensitive, so just call exists( ).  
     // This is faster, but the main reason to do this is to  
     // avoid multi-threading problems with the IFS directory APIs  
     // (even though they claim to be threadsafe).  
     realPath = path;  
     return exists(path);  
 #else  
     realPath.clear();     realPath.clear();
     CString cpath = _clonePath(path);     CString cpath = _clonePath(path);
     const char* p = cpath;     const char* p = cpath;
Line 136 
Line 117 
     }     }
  
     return false;     return false;
 #endif  
 } }
  
 Boolean FileSystem::canRead(const String& path) Boolean FileSystem::canRead(const String& path)
Line 269 
Line 249 
 #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 312 
Line 288 
     for (Uint32 i = 0, n = fileList.size(); i < n; i++)     for (Uint32 i = 0, n = fileList.size(); i < n; i++)
     {     {
         String newPath = path;   // extend path to subdir         String newPath = path;   // extend path to subdir
         newPath.append(DIR_SEP);          newPath.append("/");
         newPath.append(fileList[i]);         newPath.append(fileList[i]);
  
         if (FileSystem::isDirectory(newPath))         if (FileSystem::isDirectory(newPath))
Line 396 
Line 372 
 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 405 
Line 382 
 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 413 
Line 391 
 // 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();  
 #else  
     CString tempPath = path.getCString();     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 + DIR_SEP + filename) == true) {          if (FileSystem::exists(path + "/" + filename) == true)
           root = path + DIR_SEP + filename;          {
               root = path + "/" + filename;
           break;           break;
         } else          }
           else
           {           {
           //  cout << "File does not exist.\n";           //  cout << "File does not exist.\n";
           }           }
Line 467 
Line 446 
     fileName = libraryName + String(".dll");     fileName = libraryName + String(".dll");
 #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)
     fileName = String("lib") + libraryName + String(".sl");     fileName = String("lib") + libraryName + 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");     fileName = String("lib") + libraryName + String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
Line 509 
Line 486 
     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
   //
   Boolean FileSystem::changeFileOwner(
       const String& fileName,
       const String& userName)
   {
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
   
       return true;
   
   #else
   
       PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");
   
       struct passwd* userPasswd;
   #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \
       defined(PEGASUS_OS_HPUX) || \
       defined (PEGASUS_OS_LINUX)
   
       const unsigned int PWD_BUFF_SIZE = 1024;
       struct passwd pwd;
       struct passwd *result;
       char pwdBuffer[PWD_BUFF_SIZE];
   
       if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,
                     &userPasswd) != 0)
       {
           userPasswd = (struct passwd*)NULL;
       }
   
   #else
   
       userPasswd = getpwnam(userName.getCString());
   #endif
   
       if (userPasswd  == NULL)
       {
           PEG_METHOD_EXIT();
           return false;
       }
   
       Sint32 ret = chown(
           fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);
   
       if (ret == -1)
       {
           PEG_METHOD_EXIT();
           return false;
       }
   
       PEG_METHOD_EXIT();
   
       return true;
   #endif
   }
   
   #endif /* !defined(PEGASUS_OS_VXWORKS) */
   
   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
   }
   
   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.62.2.1  
changed lines
  Added in v.1.71.6.3
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2