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.17 and 1.40

version 1.17, 2001/04/15 17:59:11

version 1.40, 2002/09/11 19:11:54

Line 1

//BEGIN_LICENSE

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

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

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

//END_LICENSE

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

//BEGIN_HISTORY

// Author:

// Modified By:

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

// $Log$

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

// Revision 1.17 2001/04/15 17:59:11 mike

// todo

// Revision 1.16 2001/04/13 19:57:17 mike

// Fixed several memory leaks.

// Fixed build crash problem (caused by screwed up NT flags).

// Revision 1.15 2001/04/12 09:57:39 mike

// Post Channel Port to Linux

// Revision 1.13 2001/04/08 21:57:13 karl

// dir hier tested

// Revision 1.12 2001/04/08 20:31:55 mike

// Fixed

// Revision 1.11 2001/04/08 20:29:41 mike

// Added std:: before cout and endl

// Revision 1.10 2001/04/08 20:28:27 karl

// test

// Revision 1.9 2001/04/08 19:56:38 karl

// Test version

// Revision 1.8 2001/04/08 19:20:04 mike

// more TCP work

// Revision 1.7 2001/04/08 01:13:21 mike

// Changed "ConstCIM" to "CIMConst"

// Revision 1.5 2001/03/11 23:35:32 mike

// Ports to Linux

// Revision 1.3 2001/02/13 02:06:40 mike

// Added renameFile() method.

// Revision 1.2 2001/02/11 05:42:33 mike

// new

// Revision 1.1.1.1 2001/01/14 19:51:35 mike

// Pegasus import

//END_HISTORY

#include <iostream>

#include <cstdio>

Line 75

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.getLength() - 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 117

Line 67

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

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 142

Line 92

dirPath = ".";

}

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;

}

Line 163

Line 114

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.getSize(); 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 252

Line 141

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 269

Line 156

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 321

Line 204

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;

is.open(_clonePath(realPath) 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;

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

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 336

Line 312

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 365

Line 335

}

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.getLength(); i < n; i++)

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

{

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

path[i] = '/';

}

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.17
changed lines
	Added in v.1.40

No CVS admin address has been configured