(file) Return to Dir.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Dir.h between version 1.32 and 1.35.8.1

version 1.32, 2007/06/05 09:30:45 version 1.35.8.1, 2013/06/03 22:35:12
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.  
 // 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  
 // of this software and associated documentation files (the "Software"), to  
 // deal in the Software without restriction, including without limitation the  
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 // sell copies of the Software, and to permit persons to whom the Software is  
 // furnished to do so, subject to the following conditions:  
 //  
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // 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.  
 // //
 //==============================================================================  // Permission is hereby granted, free of charge, to any person obtaining a
   // copy of this software and associated documentation files (the "Software"),
   // to deal in the Software without restriction, including without limitation
   // the rights to use, copy, modify, merge, publish, distribute, sublicense,
   // and/or sell copies of the Software, and to permit persons to whom the
   // Software is furnished to do so, subject to the following conditions:
   //
   // The above copyright notice and this permission notice shall be included
   // in all copies or substantial portions of the Software.
   //
   // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 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.
   //
   //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 40 
Line 38 
 #include <Pegasus/Common/Linkage.h> #include <Pegasus/Common/Linkage.h>
 #include <Pegasus/Common/AutoPtr.h> #include <Pegasus/Common/AutoPtr.h>
  
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_GNU)  #if defined(PEGASUS_OS_SOLARIS)
 # include <sys/param.h> # include <sys/param.h>
 # include <dirent.h>  
 #endif #endif
 #ifdef PEGASUS_OS_ZOS  
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
   # include <io.h>
   #else // if defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS)
 # include <dirent.h> # include <dirent.h>
 #endif #endif
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # include <io.h>  
  typedef struct  typedef struct
  {  {
 # if _MSC_VER < 1300 # if _MSC_VER < 1300
Line 61 
Line 61 
 # endif # endif
     struct _finddata_t findData;     struct _finddata_t findData;
  } DirRep;  } DirRep;
 #elif defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS)  
 # if defined(PEGASUS_OS_SOLARIS)  
 #  include <sys/param.h>  
 # endif /* if defined(PEGASUS_OS_SOLARIS) */  
  
 # include <dirent.h>  #else // if defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS)
   
 # define PEGASUS_HAS_READDIR_R  
  
  struct DirRep  struct DirRep
  {  {
     DIR* dir;     DIR* dir;
     struct dirent* entry;     struct dirent* entry;
 # ifdef PEGASUS_HAS_READDIR_R  
 #   ifdef PEGASUS_OS_SOLARIS #   ifdef PEGASUS_OS_SOLARIS
 private: private:
         char buf[sizeof(dirent) + MAXNAMELEN];         char buf[sizeof(dirent) + MAXNAMELEN];
Line 86 
Line 80 
 #   else /* ifdef PEGASUS_OS_SOLARIS */ #   else /* ifdef PEGASUS_OS_SOLARIS */
     struct dirent buffer;     struct dirent buffer;
 #   endif /* ifdef PEGASUS_OS_SOLARIS */ #   endif /* ifdef PEGASUS_OS_SOLARIS */
 # endif /* ifdef PEGASUS_HAS_READDIR_R */  
 }; };
 #endif /* elif defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS) */  #endif
  
 /** The Dir class provides a platform independent way of iterating the /** The Dir class provides a platform independent way of iterating the
     files in a directory.     files in a directory.
Line 135 
Line 128 
 private: private:
  
     Boolean _more;     Boolean _more;
     Boolean _isValid;  
     String _path;     String _path;
     DirRep _dirRep;     DirRep _dirRep;
 }; };

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