(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.60 and 1.69

version 1.60, 2005/11/21 10:03:05 version 1.69, 2007/02/12 12:18:53
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 47 
Line 38 
 #include <Pegasus/Common/AutoPtr.h> #include <Pegasus/Common/AutoPtr.h>
 #include "FileSystem.h" #include "FileSystem.h"
 #include "Dir.h" #include "Dir.h"
   #ifndef PEGASUS_OS_TYPE_WINDOWS
   #include <pwd.h>
   #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 390 
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 399 
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 418 
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 457 
Line 460 
     // Add the necessary prefix and suffix to convert the library name to its     // Add the necessary prefix and suffix to convert the library name to its
     // corresponding file name.     // corresponding file name.
     //     //
 #if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC)  #if defined(PEGASUS_OS_TYPE_WINDOWS)
     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");
Line 503 
Line 506 
     return gotChar;     return gotChar;
 } }
  
   //
   // 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;
       }
   
   #elif defined(PEGASUS_OS_OS400)
       CString tempName = userName.getCString();
       const char* tmp = tempName;
       AtoE((char *)tmp);
       userPasswd = getpwnam(tmp);
   #else
   
       userPasswd = getpwnam(userName.getCString());
   #endif
   
       if (userPasswd  == NULL)
       {
           PEG_METHOD_EXIT();
           return false;
       }
   
   #if defined(PEGASUS_OS_OS400)
       CString tempPath = fileName.getCString();
       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)
       {
           PEG_METHOD_EXIT();
           return false;
       }
   
       PEG_METHOD_EXIT();
   
       return true;
   #endif
   }
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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