cvs commit: logging-log4cxx/src rollingfileappender.cpp dailyrollingfileappender.cpp

[mcatan]

mcatan      2004/04/18 00:42:38

  Modified:    src      rollingfileappender.cpp
                        dailyrollingfileappender.cpp
  Log:
  fixed, in the renaming algorithm, a problem specific to Unicode
  
  Revision  Changes    Path
  1.8       +6 -2      logging-log4cxx/src/rollingfileappender.cpp
  
  Index: rollingfileappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/rollingfileappender.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- rollingfileappender.cpp   28 Feb 2004 15:07:50 -0000      1.7
  +++ rollingfileappender.cpp   18 Apr 2004 07:42:38 -0000      1.8
  @@ -70,7 +70,9 @@
                        file << fileName << _T(".") << i;
                        target << fileName << _T(".") << (i + 1);
                        LogLog::debug(_T("Renaming file ") + file.str() + _T(" 
to ") + target.str());
  -                     rename(T2A(file.str().c_str()), 
T2A(target.str().c_str()));
  +                     std::string aFileName = T2A(file.str().c_str());
  +                     std::string aTarget = T2A(target.str().c_str());
  +                     rename(aFileName.c_str(), aTarget.c_str());
                }
   
                // Rename fileName to fileName.1
  @@ -78,7 +80,9 @@
                target << fileName << _T(".") << 1;
   
                LogLog::debug(_T("Renaming file ") + fileName + _T(" to ") + 
target.str());
  -             rename(T2A(fileName.c_str()), T2A(target.str().c_str()));
  +             std::string aFileName = T2A(file.str().c_str());
  +             std::string aTarget = T2A(target.str().c_str());
  +             rename(aFileName.c_str(), aTarget.c_str());
        }
   
        // Open the current file up again in truncation mode
  
  
  
  1.5       +3 -1      logging-log4cxx/src/dailyrollingfileappender.cpp
  
  Index: dailyrollingfileappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/dailyrollingfileappender.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dailyrollingfileappender.cpp      5 Apr 2004 20:52:25 -0000       1.4
  +++ dailyrollingfileappender.cpp      18 Apr 2004 07:42:38 -0000      1.5
  @@ -217,7 +217,9 @@
        USES_CONVERSION;
        remove(T2A(scheduledFilename.c_str()));
   
  -     if (rename(T2A(fileName.c_str()), T2A(scheduledFilename.c_str())) == 0)
  +     std::string aFileName = T2A(fileName.c_str());
  +     std::string aScheduledFilename = T2A(scheduledFilename.c_str());
  +     if (rename(aFileName.c_str(), aScheduledFilename.c_str()) == 0)
        {
                LogLog::debug(fileName + _T(" -> ") + scheduledFilename);
        }