(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.76.2.1 and 1.87.10.2

version 1.76.2.1, 2008/06/03 13:59:17 version 1.87.10.2, 2013/09/01 11:06:00
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // 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
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <iostream> #include <iostream>
 //#include <cstdio>  
 #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>
Line 43 
Line 40 
 #include <pwd.h> #include <pwd.h>
 #endif #endif
 #include <Pegasus/Common/Tracer.h> #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 76 
Line 74 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
 #if !defined(PEGASUS_OS_VMS) && !defined(PEGASUS_OS_TYPE_WINDOWS)  #if !defined(PEGASUS_OS_VMS) && \
       !defined(PEGASUS_OS_TYPE_WINDOWS) && \
       !defined(PEGASUS_OS_DARWIN)
  
     // If a file exists that has the same case as the path parmater,     // If a file exists that has the same case as the path parmater,
     // then we can bypass the expensive directory scanning below.     // then we can bypass the expensive directory scanning below.
Line 447 
Line 447 
     return root;     return root;
 } }
  
   #ifdef PEGASUS_ENABLE_PROTOCOL_WEB
   
   String FileSystem::getAbsoluteFileName(
       const String& filename)
   {
       char resolvedName[PATH_MAX+1];
       /*
        * ReturnValue:
        *    1) Upon successful completion, realpath() shall return a pointer to
        *        the buffer containing the resolved name. Otherwise, realpath()
        *        shall return a null pointer and set errno to indicate the error.
        *    2) If the resolved_name argument is a null pointer, the pointer
        *        returned by realpath() can be passed to free().
        *    3) If the resolved_name argument is not a null pointer and the
        *        realpath() function fails, the contents of the buffer pointed to
        *        by resolved_name are undefined.
        */
       char* result = realpath(filename.getCString(), resolvedName);
       if (!result)
       {// failed, resolvedName is undefined
           return String("");
       }
       return String(result);
   }
   
   #endif
   
 String FileSystem::buildLibraryFileName(const String &libraryName) String FileSystem::buildLibraryFileName(const String &libraryName)
 { {
     String fileName;     String fileName;
Line 467 
Line 494 
 { {
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     return String(".dll");     return String(".dll");
 #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)  #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) || \
       defined (PEGASUS_PLATFORM_HPUX_PARISC_GNU)
     return String(".sl");     return String(".sl");
 #elif defined(PEGASUS_OS_DARWIN) #elif defined(PEGASUS_OS_DARWIN)
     return String(".dylib");     return String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
     return String(".exe");     return String(".exe");
   #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES64_IBM)
       return String("64.so");
 #else #else
     return String(".so");     return String(".so");
 #endif #endif
 } }
  
 Boolean GetLine(PEGASUS_STD(istream)& is, String& line)  Boolean GetLine(PEGASUS_STD(istream)& is, Buffer& line)
 { {
       const Uint32 buffersize = 1024;
       Uint32 gcount = 0;
   
     line.clear();     line.clear();
  
     Boolean gotChar = false;      // Read the input line in chunks.  A non-full buffer indicates the end of
 #ifdef PEGASUS_PLATFORM_ZOS_ZSERIES_IBM      // the line has been reached.
     char input[1000];      do
     is.getline(input,1000);      {
     line.assign(input);          char input[buffersize];
  
     gotChar = !(is.rdstate() & PEGASUS_STD(istream)::failbit);          // This reads up to buffersize-1 char, but stops before consuming
 #else          // a newline character ('\n').
     char c;          is.get(input, buffersize);
  
     while (is.get(c))          gcount = (Uint32)is.gcount();
     {          line.append(input, gcount);
         gotChar = true;  
  
         if (c == '\n')          if (is.rdstate() & PEGASUS_STD(istream)::failbit)
           {
               // It is okay if we encounter the newline character without reading
               // data.
               is.clear();
             break;             break;
           }
       } while (gcount == buffersize-1);
  
         line.append(c);      if (!is.eof())
       {
           // we need to consume the '\n', because get() doesn't
           char c = 0;
           is.get(c);
     }     }
 #endif  
  
     return gotChar;      return !!is;
 } }
  
 // //
Line 522 
Line 563 
     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");
  
     struct passwd* userPasswd;     struct passwd* userPasswd;
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \  #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_PLATFORM_SOLARIS_IX86_CC) || \  
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined(PEGASUS_OS_LINUX) || \     defined(PEGASUS_OS_LINUX) || \
     defined (PEGASUS_OS_VMS)      defined (PEGASUS_OS_VMS) || \
       defined (PEGASUS_OS_AIX)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd pwd;     struct passwd pwd;
     struct passwd *result;  
     char pwdBuffer[PWD_BUFF_SIZE];     char pwdBuffer[PWD_BUFF_SIZE];
  
     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,
Line 565 
Line 605 
 #endif #endif
 } }
  
   #if defined(PEGASUS_OS_HPUX)
 void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)& fs) void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)& fs)
 { {
 #if defined(PEGASUS_OS_HPUX)    #if defined (PEGASUS_PLATFORM_HPUX_IA64_GNU) || \
       defined (PEGASUS_PLATFORM_HPUX_PARISC_GNU)
       // Writes the data from the iostream buffers to the OS buffers
       fs.flush();
       // Writes the data from the OS buffers to the disk
       fs.rdbuf()->pubsync();
       #else
     // Writes the data from the iostream buffers to the OS buffers     // Writes the data from the iostream buffers to the OS buffers
     fs.flush();     fs.flush();
     // Writes the data from the OS buffers to the disk     // Writes the data from the OS buffers to the disk
     fsync(fs.rdbuf()->fd());     fsync(fs.rdbuf()->fd());
 #endif #endif
 } }
   #else
   void FileSystem::syncWithDirectoryUpdates(PEGASUS_STD(fstream)&)
   {
       //Not HP-UX, do nothing (compiler will remove this fct on optimization)
   }
   #endif
  
 Boolean FileSystem::glob( Boolean FileSystem::glob(
     const String& path,     const String& path,


Legend:
Removed from v.1.76.2.1  
changed lines
  Added in v.1.87.10.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2