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

version 1.64, 2006/10/03 15:28:22 version 1.67, 2007/02/09 19:22:43
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 395 
Line 384 
 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 394 
 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 423 
Line 414 
     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 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 550 
Line 550 
     if ( userPasswd  == NULL)     if ( userPasswd  == NULL)
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return (false);          return false;
     }     }
  
 #if defined(PEGASUS_OS_OS400) #if defined(PEGASUS_OS_OS400)
Line 559 
Line 559 
     AtoE((char *)tmp1);     AtoE((char *)tmp1);
     Sint32 ret = chown(tmp1, userPasswd->pw_uid, userPasswd->pw_gid);     Sint32 ret = chown(tmp1, userPasswd->pw_uid, userPasswd->pw_gid);
 #else #else
     Sint32 ret = chown(fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);      Sint32 ret = chown(
           fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);
 #endif #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(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
 } }
   
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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