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

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

version 1.43.6.1, 2003/08/13 19:39:50

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 31

Line 34

#include <Pegasus/Common/System.h>

#include "Destroyer.h"

#include "FileSystem.h"

#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:

static char* _clonePath(const String& path)

static CString _clonePath(const String& path)

{

char* p = path.allocateCString();

String clone = path;

if (!*p)

return p;

char* last = p + path.size() - 1;

if (*last == '/')

if (clone.size() && clone[clone.size()-1] == '/')

*last = '\0';

clone.remove(clone.size()-1);

return p;

return clone.getCString();

}

Boolean FileSystem::exists(const String& path)

{

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

return System::exists(_clonePath(path));

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

}

Boolean FileSystem::getCurrentDirectory(String& path)

Line 73

Line 67

return true;

}

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

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

{

#ifdef PEGASUS_OS_OS400

// The OS/400 file system is case insensitive, so just call exists( ).

// This is faster, but the main reason to do this is to

// avoid multi-threading problems with the IFS directory APIs

// (even though they claim to be threadsafe).

realPath = path;

return exists(path);

#else

realPath.clear();

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

CString cpath = _clonePath(path);

char* p = destroyer.getPointer();

const char* p = cpath;

char* dirPath;

const char* dirPath;

char* fileName;

const char* fileName;

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

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

if (slash)

{

Line 101

Line 103

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

{

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

if (System::strcasecmp(fileName, dir.getName()) == 0)

{

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

realPath = dir.getName();

else

{

realPath = dirPath;

realPath += '/';

realPath.append('/');

realPath += dir.getName();

realPath.append(dir.getName());

}

return true;

}

return false;

#endif

}

Boolean FileSystem::canRead(const String& path)

{

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

return System::canRead(_clonePath(path));

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

}

Boolean FileSystem::canWrite(const String& path)

{

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

return System::canWrite(_clonePath(path));

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(_clonePath(path), size);

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

return System::removeFile(_clonePath(path));

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

}

void FileSystem::loadFileToMemory(

Line 209

Line 150

if (!getFileSize(fileName, fileSize))

throw CannotOpenFile(fileName);

char* tmp = fileName.allocateCString();

FILE* fp = fopen(fileName.getCString(), "rb");

FILE* fp = fopen(tmp, "rb");

delete [] tmp;

if (fp == NULL)

throw CannotOpenFile(fileName);

array.reserve(fileSize);

array.reserveCapacity(fileSize);

char buffer[4096];

size_t n;

Line 226

Line 165

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

FILE* fp1 = fopen(path1.getCString(), "rb");

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

delete [] tmp1;

if (fp1 == NULL)

throw CannotOpenFile(fileName1);

throw CannotOpenFile(path1);

char* tmp2 = fileName2.allocateCString();

FILE* fp2 = fopen(path2.getCString(), "rb");

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

delete [] tmp2;

if (fp2 == NULL)

{

fclose(fp1);

throw CannotOpenFile(fileName2);

throw CannotOpenFile(path2);

}

int c1;

Line 278

Line 213

return true;

}

Boolean FileSystem::renameFile(

const String& oldPath,

const String& newPath)

{

return System::renameFile(oldPath.getCString(), newPath.getCString());

}

Boolean FileSystem::copyFile(

const String& fromPath,

const String& toPath)

{

return System::copyFile(fromPath.getCString(), toPath.getCString());

}

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

{

String realPath;

if (!existsNoCase(path, realPath))

return false;

#if defined(PEGASUS_OS_OS400)

CString tempPath = _clonePath(realPath);

const char * tmp = tempPath;

AtoE((char *)tmp);

is.open(tmp PEGASUS_IOS_BINARY);

#else

is.open(_clonePath(realPath) PEGASUS_IOS_BINARY);

#endif

return !!is;

}

Boolean FileSystem::openNoCase(

PEGASUS_STD(fstream)& fs,

const String& path,

int mode)

{

String realPath;

if (!existsNoCase(path, realPath))

return false;

#if defined(__GNUC__) && GCC_VERSION >= 30200

fs.open(_clonePath(realPath), PEGASUS_STD(ios_base::openmode)(mode));

#else

#if defined(PEGASUS_OS_OS400)

CString tempPath = _clonePath(realPath);

const char * tmp = tempPath;

AtoE((char *)tmp);

fs.open(tmp, mode, PEGASUS_STD(_CCSID_T(1208)) );

#else

fs.open(_clonePath(realPath), mode);

#endif

return !!fs;

}

Boolean FileSystem::isDirectory(const String& path)

{

return System::isDirectory(_clonePath(path));

}

Boolean FileSystem::changeDirectory(const String& path)

{

return System::changeDirectory(_clonePath(path));

}

Boolean FileSystem::makeDirectory(const String& path)

{

return System::makeDirectory(_clonePath(path));

}

Boolean FileSystem::removeDirectory(const String& path)

{

return System::removeDirectory(_clonePath(path));

}

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 339

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 362

}

Boolean FileSystem::renameFile(

Boolean FileSystem::isDirectoryEmpty(const String& path)

const String& oldFileName,

{

const String& newFileName)

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

{

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

const char* name = dir.getName();

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

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

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)

// Return the just the base name from the path.

String FileSystem::extractFileName(const String& path)

{

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

char *p_path = new char[path.size() + 1];

String basename = System::extract_file_name((const char *)path.getCString(), p_path);

delete [] p_path;

return basename;

}

// Return just the path to the file or directory into path

String FileSystem::extractFilePath(const String& path)

{

const char* name = dir.getName();

char *p_path = new char[path.size() + 1];

String newpath = System::extract_file_path((const char *)path.getCString(), p_path);

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

delete [] p_path;

return false;

return newpath;

}

return true;

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

{

line.clear();

Boolean gotChar = false;

char c;

while (is.get(c))

{

gotChar = true;

if (c == '\n')

break;

line.append(c);

}

return gotChar;

}

PEGASUS_NAMESPACE_END

Legend:

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

No CVS admin address has been configured