(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.57.2.1 and 1.64

version 1.57.2.1, 2005/09/30 16:28:15 version 1.64, 2006/10/03 15:28:22
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 47 
Line 49 
 #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 426 
Line 431 
   String root = String::EMPTY;   String root = String::EMPTY;
   String tempPath = paths;   String tempPath = paths;
  
 #if defined(PEGASUS_OS_VMS)  
  
   if (FileSystem::exists(paths + filename) == true)  
   {  
     root = filename;  
   }  
 #else  
   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();
Line 451 
Line 450 
           //  cout << "File does not exist.\n";           //  cout << "File does not exist.\n";
           }           }
   } while (tempPath.size() > 0);   } while (tempPath.size() > 0);
 #endif  
   return root;   return root;
 } }
  
Line 463 
Line 462 
     // 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 486 
Line 485 
     line.clear();     line.clear();
  
     Boolean gotChar = false;     Boolean gotChar = false;
   #ifdef PEGASUS_PLATFORM_ZOS_ZSERIES_IBM
       char input[1000];
       is.getline(input,1000);
       line.assign(input);
   
       gotChar = !(is.rdstate() & PEGASUS_STD(istream)::failbit);
   #else
     char c;     char c;
  
     while (is.get(c))     while (is.get(c))
Line 497 
Line 503 
  
         line.append(c);         line.append(c);
     }     }
   #endif
  
     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.57.2.1  
changed lines
  Added in v.1.64
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2