(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.48 and 1.54

version 1.48, 2004/03/16 23:05:00 version 1.54, 2005/02/05 22:59:23
Line 1 
Line 1 
 //%2003////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // 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.
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software 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 31 
 // //
 // Modified By: // Modified By:
 //         Ramnath Ravindran(Ramnath.Ravindran@compaq.com) //         Ramnath Ravindran(Ramnath.Ravindran@compaq.com)
   //         Amit K Arora, IBM (amita@in.ibm.com)
   //         Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
   //         David Dillard, VERITAS Software Corp.
   //             (david.dillard@veritas.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 34 
Line 42 
 //#include <cstdio> //#include <cstdio>
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include "Destroyer.h"  #include <Pegasus/Common/AutoPtr.h>
 #include "FileSystem.h" #include "FileSystem.h"
 #include "Dir.h" #include "Dir.h"
  
Line 144 
Line 152 
 } }
  
 void FileSystem::loadFileToMemory( void FileSystem::loadFileToMemory(
     Array<Sint8>& array,      Array<char>& array,
     const String& fileName)     const String& fileName)
 { {
     Uint32 fileSize;     Uint32 fileSize;
Line 379 
Line 387 
 // Return the just the base name from the path. // Return the just the base name from the path.
 String  FileSystem::extractFileName(const String& path) String  FileSystem::extractFileName(const String& path)
 { {
   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);    String basename = System::extract_file_name((const char *)path.getCString(), p_path.get());
   
   delete [] p_path;  
  
   return basename;   return basename;
 } }
Line 390 
Line 396 
 // Return just the path to the file or directory into path // Return just the path to the file or directory into path
 String FileSystem::extractFilePath(const String& path) String FileSystem::extractFilePath(const String& path)
 { {
   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);    String newpath = System::extract_file_path((const char *)path.getCString(), p_path.get());
   
   delete [] p_path;  
  
   return newpath;   return newpath;
 } }
Line 406 
Line 410 
     //       EBCDIC coversion in SystemUnix.cpp     //       EBCDIC coversion in SystemUnix.cpp
     CString tempPath = path.getCString();     CString tempPath = path.getCString();
 #else #else
     CString tempPath = path.getCStringUTF8();      CString tempPath = path.getCString();
 #endif #endif
  
     return System::changeFilePermissions(tempPath, mode);     return System::changeFilePermissions(tempPath, mode);
Line 440 
Line 444 
   return root;   return root;
 } }
  
   String FileSystem::buildLibraryFileName(const String &libraryName)
   {
       String fileName;
   
       //
       // Add the necessary prefix and suffix to convert the library name to its
       // corresponding file name.
       //
   #if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC)
       fileName = libraryName + String(".dll");
   #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)
       fileName = String("lib") + libraryName + String(".sl");
   #elif defined(PEGASUS_OS_OS400)
       fileName = libraryName;
   #elif defined(PEGASUS_OS_DARWIN)
       fileName = String("lib") + libraryName + String(".dylib");
   #else
       fileName = String("lib") + libraryName + String(".so");
   #endif
   
       return fileName;
   }
   
  
 Boolean GetLine(PEGASUS_STD(istream)& is, String& line) Boolean GetLine(PEGASUS_STD(istream)& is, String& line)
 { {


Legend:
Removed from v.1.48  
changed lines
  Added in v.1.54

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2