(file) Return to TraceFileHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/TraceFileHandler.cpp between version 1.17 and 1.18

version 1.17, 2004/10/17 20:39:17 version 1.18, 2005/01/19 23:48:05
Line 30 
Line 30 
 // Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01 // Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01
 //              added nsk platform support //              added nsk platform support
 //              Amit K Arora, IBM (amita@in.ibm.com) for Bug#1527 //              Amit K Arora, IBM (amita@in.ibm.com) for Bug#1527
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 98 
Line 99 
  
 Uint32 TraceFileHandler::setFileName(const char* fileName) Uint32 TraceFileHandler::setFileName(const char* fileName)
 { {
     if (!isValidFilePath(fileName))      // If a file is already open, close it
     {  
         return 1;  
     }  
     // Check if a file is already open, if so close it  
     if (_fileHandle)     if (_fileHandle)
     {     {
         fclose(_fileHandle);         fclose(_fileHandle);
           _fileHandle = 0;
     }     }
  
     // Now open the file      delete [] _fileName;
     _fileHandle = fopen(fileName,"a+");      _fileName = 0;
     if (!_fileHandle)  #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
       delete [] _baseFileName;
       _baseFileName = 0;
   #endif
   
       if (!isValidFilePath(fileName))
     {     {
         // Unable to open file, log a message  
         //l10n  
         //Logger::put(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,  
            //"Failed to open File $0",fileName);  
         Logger::put_l(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,  
            "Common.TraceFileHandler.FAILED_TO_OPEN_FILE",  
            "Failed to open File $0",fileName);  
             return 1;             return 1;
     }     }
     else  
     {      _fileHandle = _openFile(fileName);
         if (_fileName)  
       if (!_fileHandle)
         {         {
             delete [] _fileName;          return 1;
         }         }
   
         _fileName = new char [strlen(fileName)+1];         _fileName = new char [strlen(fileName)+1];
         strcpy (_fileName,fileName);         strcpy (_fileName,fileName);
 #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
         _baseFileName = new char [strlen(fileName)+1];         _baseFileName = new char [strlen(fileName)+1];
         strcpy (_baseFileName,fileName);         strcpy (_baseFileName,fileName);
 #endif #endif
   
       return 0;
   }
   
   FILE* TraceFileHandler::_openFile(const char* fileName)
   {
       FILE* fileHandle = fopen(fileName,"a+");
       if (!fileHandle)
       {
           // Unable to open file, log a message
           Logger::put_l(Logger::DEBUG_LOG, "Tracer", Logger::WARNING,
               "Common.TraceFileHandler.FAILED_TO_OPEN_FILE",
               "Failed to open file $0", fileName);
           return 0;
     }     }
  
     //     //
     // Set permissions on the trace file to 0600      // Set the file permissions to 0600
     //     //
 #if !defined(PEGASUS_OS_TYPE_WINDOWS) #if !defined(PEGASUS_OS_TYPE_WINDOWS)
     if ( !FileSystem::changeFilePermissions(String(_fileName), (S_IRUSR|S_IWUSR)) )      if (!FileSystem::changeFilePermissions(
               String(fileName), (S_IRUSR|S_IWUSR)) )
 #else #else
     if ( !FileSystem::changeFilePermissions(String(_fileName), (_S_IREAD | _S_IWRITE )) )      if (!FileSystem::changeFilePermissions(
               String(fileName), (_S_IREAD|_S_IWRITE)) )
 #endif #endif
     {     {
         Logger::put_l(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,         Logger::put_l(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,
            "Common.TraceFileHandler.FAILED_TO_SET_FILE_PERMISSIONS",            "Common.TraceFileHandler.FAILED_TO_SET_FILE_PERMISSIONS",
            "Failed to set permissions on file $0", _fileName);             "Failed to set permissions on file $0", fileName);
             return 1;          fclose(fileHandle);
           return 0;
     }     }
  
       //
       // Verify that the file has the correct owner
       //
       if (!System::verifyFileOwnership(fileName))
       {
           Logger::put_l(Logger::ERROR_LOG, "Tracer", Logger::WARNING,
              "Common.TraceFileHandler.UNEXPECTED_FILE_OWNER",
              "File $0 is not owned by user $1.", fileName,
              System::getEffectiveUserName());
           fclose(fileHandle);
     return 0;     return 0;
 } }
  
       return fileHandle;
   }
   
 Boolean TraceFileHandler::isValidFilePath(const char* filePath) Boolean TraceFileHandler::isValidFilePath(const char* filePath)
 { {
     String fileName = String(filePath);     String fileName = String(filePath);


Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2