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.21 and 1.36

version 1.21, 2001/05/06 00:09:12

version 1.36, 2002/07/19 23:00:25

Line 1

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

// The Open Group, Tivoli Systems

// Permission is hereby granted, free of charge, to any person obtaining a

// Permission is hereby granted, free of charge, to any person obtaining a copy

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

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

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

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

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

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

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

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

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

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

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

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

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

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

// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

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

// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

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

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

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

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

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

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

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

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

// Modified By:

// Ramnath Ravindran(Ramnath.Ravindran@compaq.com)

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

Line 34

Line 37

#include "System.h"

#include "Dir.h"

using namespace std;

PEGASUS_NAMESPACE_BEGIN

// Clone the path as a C String but discard trailing slash if any:

Line 73

Line 74

return true;

}

Boolean FileSystem::existsIgnoreCase(const String& path, String& realPath)

Boolean FileSystem::existsNoCase(const String& path, String& realPath)

{

realPath.clear();

ArrayDestroyer<char> destroyer(_clonePath(path));

char* p = destroyer.getPointer();

char* dirPath;

const char* dirPath;

char* fileName;

char* slash = strrchr(p, '/');

Line 101

Line 102

for (Dir dir(dirPath); dir.more(); dir.next())

{

if (CompareIgnoreCase(fileName, dir.getName()) == 0)

if (CompareNoCase(fileName, dir.getName()) == 0)

{

if (strcmp(dirPath, ".") == 0)

realPath = dir.getName();

Line 130

Line 131

return System::canWrite(p.getPointer());

}

Boolean FileSystem::isDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::isDirectory(p.getPointer());

}

Boolean FileSystem::changeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::changeDirectory(p.getPointer());

}

Boolean FileSystem::makeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::makeDirectory(p.getPointer());

}

Boolean FileSystem::getFileSize(const String& path, Uint32& size)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::getFileSize(p.getPointer(), size);

}

Boolean FileSystem::removeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::removeDirectory(p.getPointer());

}

Boolean FileSystem::removeDirectoryHier(const String& path)

{

Array<String> fileList;

// Get contents of current directory

if (!FileSystem::getDirectoryContents(path,fileList))

return false;

// for files-in-directory, delete or recall removedir

for (Uint32 i = 0, n = fileList.size(); i < n; i++)

{

String newPath = path; // extend path to subdir

newPath.append("/");

newPath.append(fileList[i]);

if (FileSystem::isDirectory(newPath))

{

// Recall ourselves with extended path

if (!FileSystem::removeDirectoryHier(newPath))

return false;

}

else

{

if (!FileSystem::removeFile(newPath))

return false;

}

return removeDirectory(path);

}

Boolean FileSystem::removeFile(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

Line 216

Line 159

if (fp == NULL)

throw CannotOpenFile(fileName);

array.reserve(fileSize);

array.reserveCapacity(fileSize);

char buffer[4096];

size_t n;

Line 226

Line 169

fclose(fp);

}

Boolean FileSystem::compare(

Boolean FileSystem::compareFiles(

const String& fileName1,

const String& path1,

const String& fileName2)

const String& path2)

{

Uint32 fileSize1;

if (!getFileSize(fileName1, fileSize1))

if (!getFileSize(path1, fileSize1))

throw CannotOpenFile(fileName1);

throw CannotOpenFile(path1);

Uint32 fileSize2;

if (!getFileSize(fileName2, fileSize2))

if (!getFileSize(path2, fileSize2))

throw CannotOpenFile(fileName2);

throw CannotOpenFile(path2);

if (fileSize1 != fileSize2)

return false;

char* tmp1 = fileName1.allocateCString();

char* tmp1 = path1.allocateCString();

FILE* fp1 = fopen(tmp1, "rb");

delete [] tmp1;

if (fp1 == NULL)

throw CannotOpenFile(fileName1);

throw CannotOpenFile(path1);

char* tmp2 = fileName2.allocateCString();

char* tmp2 = path2.allocateCString();

FILE* fp2 = fopen(tmp2, "rb");

delete [] tmp2;

if (fp2 == NULL)

{

fclose(fp1);

throw CannotOpenFile(fileName2);

throw CannotOpenFile(path2);

}

int c1;

Line 278

Line 221

return true;

}

Boolean FileSystem::renameFile(

const String& oldPath,

const String& newPath)

{

ArrayDestroyer<char> p(oldPath.allocateCString());

ArrayDestroyer<char> q(newPath.allocateCString());

return System::renameFile(p.getPointer(), q.getPointer());

}

Boolean FileSystem::copyFile(

const String& fromPath,

const String& toPath)

{

ArrayDestroyer<char> p(fromPath.allocateCString());

ArrayDestroyer<char> q(toPath.allocateCString());

return System::copyFile(p.getPointer(), q.getPointer());

}

Boolean FileSystem::openNoCase(PEGASUS_STD(ifstream)& is, const String& path)

{

String realPath;

if (!existsNoCase(path, realPath))

return false;

ArrayDestroyer<char> p(_clonePath(realPath));

is.open(p.getPointer() PEGASUS_IOS_BINARY);

return !!is;

}

Boolean FileSystem::openNoCase(

PEGASUS_STD(fstream)& fs,

const String& path,

int mode)

{

String realPath;

if (!existsNoCase(path, realPath))

return false;

ArrayDestroyer<char> p(_clonePath(realPath));

fs.open(p.getPointer(), mode);

return !!fs;

}

Boolean FileSystem::isDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::isDirectory(p.getPointer());

}

Boolean FileSystem::changeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::changeDirectory(p.getPointer());

}

Boolean FileSystem::makeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::makeDirectory(p.getPointer());

}

Boolean FileSystem::removeDirectory(const String& path)

{

ArrayDestroyer<char> p(_clonePath(path));

return System::removeDirectory(p.getPointer());

}

Boolean FileSystem::removeDirectoryHier(const String& path)

{

Array<String> fileList;

// Get contents of current directory

if (!FileSystem::getDirectoryContents(path,fileList))

return false;

// for files-in-directory, delete or recall removedir

for (Uint32 i = 0, n = fileList.size(); i < n; i++)

{

String newPath = path; // extend path to subdir

newPath.append("/");

newPath.append(fileList[i]);

if (FileSystem::isDirectory(newPath))

{

// Recall ourselves with extended path

if (!FileSystem::removeDirectoryHier(newPath))

return false;

}

else

{

if (!FileSystem::removeFile(newPath))

return false;

}

return removeDirectory(path);

}

// Get the file list in the directory into the

// array of strings provided

Line 293

Line 341

const String& path,

Array<String>& paths)

{

#if 0

// This may be just extra fluff but added anyway

if (!FileSystem::isDirectory(path))

return false;

#endif

paths.clear();

try

Line 322

Line 364

}

Boolean FileSystem::renameFile(

Boolean FileSystem::isDirectoryEmpty(const String& path)

const String& oldFileName,

const String& newFileName)

{

ArrayDestroyer<char> p(oldFileName.allocateCString());

for (Dir dir(path); dir.more(); dir.next())

ArrayDestroyer<char> q(newFileName.allocateCString());

{

return System::renameFile(p.getPointer(), q.getPointer());

const char* name = dir.getName();

if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0)

return false;

}

return true;

}

void FileSystem::translateSlashes(String& path)

{

for (Uint32 i = 0, n = path.size(); i < n; i++)

for (Uint32 i = 0; i < path.size(); i++)

{

if (path[i] == '\\')

path[i] = '/';

}

Boolean FileSystem::isDirectoryEmpty(const String& path)

Boolean GetLine(PEGASUS_STD(istream)& is, String& line)

{

for (Dir dir(path); dir.more(); dir.next())

line.clear();

Boolean gotChar = false;

char c;

while (is.get(c))

{

const char* name = dir.getName();

gotChar = true;

if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0)

if (c == '\n')

return false;

break;

line.append(c);

}

return true;

return gotChar;

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.21
changed lines
	Added in v.1.36

No CVS admin address has been configured