(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.6.14.1 and 1.26

version 1.6.14.1, 2003/08/13 19:39:51 version 1.26, 2005/07/22 22:05:57
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 25 
Line 31 
 // //
 // 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
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
   //              Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <fstream>  //#include <fstream>
 #include <iostream>  //#include <iostream>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/TraceFileHandler.h> #include <Pegasus/Common/TraceFileHandler.h>
  
Line 39 
Line 48 
 # include <Pegasus/Common/TraceFileHandlerUnix.cpp> # include <Pegasus/Common/TraceFileHandlerUnix.cpp>
 #elif defined(PEGASUS_OS_TYPE_NSK) #elif defined(PEGASUS_OS_TYPE_NSK)
 # include <Pegasus/Common/TraceFileHandlerNsk.cpp> # include <Pegasus/Common/TraceFileHandlerNsk.cpp>
   #elif defined(PEGASUS_OS_VMS)
   # include <Pegasus/Common/TraceFileHandlerVms.cpp>
 #else #else
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
Line 57 
Line 68 
     _fileName = 0;     _fileName = 0;
     _fileHandle = 0;     _fileHandle = 0;
     _wroteToLog = false;     _wroteToLog = false;
   #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
       _baseFileName = 0;
       _fileCount = 0;
   #endif
 } }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 74 
Line 89 
     {     {
         delete []_fileName;         delete []_fileName;
     }     }
   #ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
       if (_baseFileName)
       {
           delete []_baseFileName;
       }
   #endif
 } }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 83 
Line 104 
  
 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 (!_fileHandle)
         if (_fileName)  
         {         {
             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
       _baseFileName = new char[strlen(fileName)+1];
       strcpy(_baseFileName, fileName);
   #endif
   
       return 0;
   }
   
   FILE* TraceFileHandler::_openFile(const char* fileName)
   {
   #ifdef PEGASUS_OS_VMS
   //    FILE* fileHandle = fopen(fileName,"a+", "shr=get,put,upd");
       FILE* fileHandle = fopen(fileName,"w", "shr=get,put,upd");
   #else
       FILE* fileHandle = fopen(fileName,"a+");
   #endif
       if (!fileHandle)
       {
           // Unable to open file, log a message
           Logger::put_l(Logger::DEBUG_LOG, System::CIMSERVER, Logger::WARNING,
               "Common.TraceFileHandler.FAILED_TO_OPEN_FILE",
               "Failed to open file $0", fileName);
           return 0;
       }
   
       //
       // Verify that the file has the correct owner
       //
       if (!System::verifyFileOwnership(fileName))
       {
           Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::WARNING,
              "Common.TraceFileHandler.UNEXPECTED_FILE_OWNER",
              "File $0 is not owned by user $1.", fileName,
              System::getEffectiveUserName());
           fclose(fileHandle);
           return 0;
     }     }
   
       //
       // Set the file permissions to 0600
       //
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
       if (!FileSystem::changeFilePermissions(
               String(fileName), (S_IRUSR|S_IWUSR)) )
   #else
       if (!FileSystem::changeFilePermissions(
               String(fileName), (_S_IREAD|_S_IWRITE)) )
   #endif
       {
           Logger::put_l(Logger::DEBUG_LOG, System::CIMSERVER, Logger::WARNING,
              "Common.TraceFileHandler.FAILED_TO_SET_FILE_PERMISSIONS",
              "Failed to set permissions on file $0", fileName);
           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);
Line 180 
Line 251 
             }             }
         }         }
     }     }
     return 1;      PEGASUS_UNREACHABLE(return 1;)
 } }
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.6.14.1  
changed lines
  Added in v.1.26
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2