version 1.31, 2006/11/10 18:14:58
|
version 1.31.2.2, 2007/01/11 01:34:35
|
|
|
| |
#include <Pegasus/Common/FileSystem.h> | #include <Pegasus/Common/FileSystem.h> |
#include <Pegasus/Common/TraceFileHandler.h> | #include <Pegasus/Common/TraceFileHandler.h> |
|
#include <Pegasus/Common/Executor.h> |
| |
#if defined(PEGASUS_OS_TYPE_WINDOWS) | #if defined(PEGASUS_OS_TYPE_WINDOWS) |
# include <Pegasus/Common/TraceFileHandlerWindows.cpp> | # include <Pegasus/Common/TraceFileHandlerWindows.cpp> |
|
|
FILE* TraceFileHandler::_openFile(const char* fileName) | FILE* TraceFileHandler::_openFile(const char* fileName) |
{ | { |
#ifdef PEGASUS_OS_VMS | #ifdef PEGASUS_OS_VMS |
// FILE* fileHandle = fopen(fileName,"a+", "shr=get,put,upd"); |
|
FILE* fileHandle = fopen(fileName,"w", "shr=get,put,upd"); | FILE* fileHandle = fopen(fileName,"w", "shr=get,put,upd"); |
#else | #else |
FILE* fileHandle = fopen(fileName,"a+"); |
FILE* fileHandle = Executor::openFile(fileName, 'a'); |
#endif | #endif |
if (!fileHandle) | if (!fileHandle) |
{ | { |
|
|
return 0; | return 0; |
} | } |
| |
|
// We are done if the executor was used to perform this. Otherwise, we |
|
// must proceed to fix file ownership and permissions. |
|
|
|
if (Executor::detectExecutor() == 0) |
|
return fileHandle; |
|
|
// | // |
// Verify that the file has the correct owner | // Verify that the file has the correct owner |
// | // |
|
|
return fileHandle; | return fileHandle; |
} | } |
| |
|
static bool _canWrite(const String& path) |
|
{ |
|
if (Executor::detectExecutor() == 0) |
|
return true; |
|
else |
|
return FileSystem::canWrite(path); |
|
} |
|
|
Boolean TraceFileHandler::isValidFilePath(const char* filePath) | Boolean TraceFileHandler::isValidFilePath(const char* filePath) |
{ | { |
String fileName = String(filePath); | String fileName = String(filePath); |
|
|
// Check if the file exists and is writable | // Check if the file exists and is writable |
if (FileSystem::exists(fileName)) | if (FileSystem::exists(fileName)) |
{ | { |
if (!FileSystem::canWrite(fileName)) |
if (!_canWrite(fileName)) |
{ | { |
return 0; | return 0; |
} | } |
|
|
{ | { |
return 0; | return 0; |
} | } |
if (!FileSystem::canWrite(dirName) ) |
if (!_canWrite(dirName) ) |
{ | { |
return 0; | return 0; |
} | } |
|
|
// current working directory | // current working directory |
FileSystem::getCurrentDirectory(currentDir); | FileSystem::getCurrentDirectory(currentDir); |
| |
if (!FileSystem::canWrite(currentDir)) |
if (!_canWrite(currentDir)) |
{ | { |
return 0; | return 0; |
} | } |
|
|
} | } |
PEGASUS_UNREACHABLE(return 1;) | PEGASUS_UNREACHABLE(return 1;) |
} | } |
|
|
PEGASUS_NAMESPACE_END | PEGASUS_NAMESPACE_END |