pegasus/src/Pegasus/Common/FileSystem.cpp - diff

Return to FileSystem.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/FileSystem.cpp between version 1.77.6.1 and 1.83

version 1.77.6.1, 2008/08/20 23:05:49

version 1.83, 2008/12/01 17:49:51

Line 1

//%2006////////////////////////////////////////////////////////////////////////

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

// EMC Corporation; VERITAS Software 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"),

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

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

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

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

Line 76

Line 74

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,

// then we can bypass the expensive directory scanning below.

Line 473

return String(".dylib");

#elif defined(PEGASUS_OS_VMS)

return String(".exe");

#elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES64_IBM)

return String("64.so");

#else

return String(".so");

#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();

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];

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;

}

} 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 525

Line 538

#if defined(PEGASUS_OS_SOLARIS) || \

defined(PEGASUS_OS_HPUX) || \

defined(PEGASUS_OS_LINUX) || \

defined (PEGASUS_OS_VMS)

defined (PEGASUS_OS_VMS) || \

defined (PEGASUS_OS_AIX)

const unsigned int PWD_BUFF_SIZE = 1024;

struct passwd pwd;

Legend:

Removed from v.1.77.6.1
changed lines
	Added in v.1.83

No CVS admin address has been configured