2002-05-12 Robert Collins <rbtcollins@hotmail.com>

[cygwin-apps/setup.git] / LogFile.cc

diff --git a/LogFile.cc b/LogFile.cc
index be027857c8b9582bc14eb8a668602bfa1c5e1b4e..38d1a04d67bf33a399257bf66ea5b4ec0d6d772c 100644 (file)
--- a/LogFile.cc
+++ b/LogFile.cc
@@ -29,6 +29,7 @@ static const char *cvsid =
 #include <iostream>
 #include <strstream>
 #include <time.h>
+#include <string>
 
 /* private helper class */
 class filedef
@@ -184,11 +185,15 @@ LogFile::endEntry()
       strftime (b, 1000, "%Y/%m/%d %H:%M:%S ", tm);
       currEnt->msg = b;
     }
-  currEnt->msg += theStream->str();
-  msg ("LOG: %d %s", currEnt->level, theStream->str());
+  /* What follows is a hack to get around an (apparent) bug in libg++-3 with
+   * non-0 memory on alloc
+   */
+  currEnt->msg += string(theStream->str()).substr(0,theStream->pcount()).c_str();
+  msg ("LOG: %d %s", currEnt->level, string(theStream->str()).substr(0,theStream->rdbuf()->pcount()).c_str());
   theStream->freeze(0);
   delete theStream;
   /* reset for next use */
   theStream = new ostrstream;
   rdbuf (theStream->rdbuf());
+  init (theStream->rdbuf());
 }