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.26 and 1.43.6.1

version 1.26, 2001/06/16 23:10:04

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 copy

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

Line 23

Line 24

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

// Modified By:

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

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

Line 32

Line 34

#include <Pegasus/Common/System.h>

#include "Destroyer.h"

#include "FileSystem.h"

#include "System.h"

#include "Dir.h"

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)

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

return p;

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

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

return clone.getCString();

if (*last == '/')

*last = '\0';

return p;

}

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 74

Line 69

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;

const char* dirPath;

char* fileName;

const char* fileName;

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

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

if (slash)

{

Line 100

Line 103

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

{

if (CompareNoCase(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::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::removeFile(const String& path)

{

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

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

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

}

void FileSystem::loadFileToMemory(

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 184

Line 182

if (fileSize1 != fileSize2)

return false;

char* tmp1 = path1.allocateCString();

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

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

delete [] tmp1;

if (fp1 == NULL)

throw CannotOpenFile(path1);

char* tmp2 = path2.allocateCString();

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

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

delete [] tmp2;

if (fp2 == NULL)

{

Line 223

Line 217

const String& oldPath,

const String& newPath)

{

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

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

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

}

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

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)

Line 235

Line 234

if (!existsNoCase(path, realPath))

return false;

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

#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

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

return !!is;

return is != 0;

}

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)

{

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

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

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

}

Boolean FileSystem::changeDirectory(const String& path)

{

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

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

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

}

Boolean FileSystem::makeDirectory(const String& path)

{

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

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

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

}

Boolean FileSystem::removeDirectory(const String& path)

{

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

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

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

}

Boolean FileSystem::removeDirectoryHier(const String& path)

Line 352

Line 377

void FileSystem::translateSlashes(String& path)

{

for (Char16* p = (Char16*)path.getData(); *p; p++)

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

{

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

path[i] = '/';

}

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

String FileSystem::extractFileName(const String& path)

{

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)

{

if (*p == '\\')

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

*p = '/';

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

delete [] p_path;

return newpath;

}

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.26
changed lines
	Added in v.1.43.6.1

No CVS admin address has been configured