pegasus/src/Pegasus/Common/Dir.h - diff

Return to Dir.h CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

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

version 1.18, 2004/12/01 09:59:11

version 1.35.8.1, 2013/06/03 22:35:12

Line 1

//%2004////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// 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

// 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

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// 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

// of this software and associated documentation files (the "Software"), to

// copy of this software and associated documentation files (the "Software"),

// deal in the Software without restriction, including without limitation the

// to deal in the Software without restriction, including without limitation

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// sell copies of the Software, and to permit persons to whom the Software is

// and/or sell copies of the Software, and to permit persons to whom the

// furnished to do so, subject to the following conditions:

// Software is furnished to do so, subject to the following conditions:

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// The above copyright notice and this permission notice shall be included

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// in all copies or substantial portions of the Software.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// 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.

//==============================================================================

//////////////////////////////////////////////////////////////////////////

// Author: Mike Brasher (mbrasher@bmc.com)

// Modified By: Amit K Arora, IBM (amita@in.ibm.com)

//%/////////////////////////////////////////////////////////////////////////////

Line 40

Line 38

#include <Pegasus/Common/Linkage.h>

#include <Pegasus/Common/AutoPtr.h>

PEGASUS_NAMESPACE_BEGIN

#if defined(PEGASUS_OS_SOLARIS)

# include <sys/param.h>

#endif

#if defined(PEGASUS_OS_TYPE_WINDOWS)

#include <io.h>

#else // if defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS)

# include <dirent.h>

#endif

PEGASUS_NAMESPACE_BEGIN

#if defined(PEGASUS_OS_TYPE_WINDOWS)

typedef struct

{

# if _MSC_VER < 1300

long file;

# else

intptr_t file;

# endif

struct _finddata_t findData;

} DirRep;

#elif defined(PEGASUS_OS_TYPE_UNIX)

#ifdef PEGASUS_OS_SOLARIS

#include <sys/param.h>

#endif

#include <dirent.h>

// ATTN: If a platform is found that does not have the readdir_r interface,

#else // if defined(PEGASUS_OS_TYPE_UNIX) || defined (PEGASUS_OS_VMS)

// this next line should be conditionally compiled out for that platform.

// Otherwise, the old readdir code can be removed.

#define PEGASUS_HAS_READDIR_R

typedef struct DirRep

struct DirRep

{

DIR* dir;

#ifdef PEGASUS_OS_OS400

struct dirent_lg* entry;

#else

struct dirent* entry;

#endif

#ifdef PEGASUS_HAS_READDIR_R

#ifdef PEGASUS_OS_OS400

struct dirent_lg buffer;

#else

#ifdef PEGASUS_OS_SOLARIS

private:

char buf[sizeof(dirent) + MAXNAMELEN];

Line 80

Line 77

inline DirRep()

: buffer(*reinterpret_cast<struct dirent *>(buf))

{ }

#else

# else /* ifdef PEGASUS_OS_SOLARIS */

struct dirent buffer;

#endif

# endif /* ifdef PEGASUS_OS_SOLARIS */

#endif

};

#endif

Line 123

Line 118

/** Return true if there are more file names to iterator. */

Boolean more() const { return _more; }

#if defined(PEGASUS_PLATFORM_DARWIN_PPC_GNU)

/** Returns the file inode number. */

const Uint32 getInode() const;

#endif

/** Returns the current file name. */

const char* getName() const;

Line 137

Line 128

private:

Boolean _more;

Boolean _isValid;

String _path;

DirRep _dirRep;

};

Legend:

Removed from v.1.18
changed lines
	Added in v.1.35.8.1

No CVS admin address has been configured