fixed minor bug in wxFileSystem's converting \ to /

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index cf366a0d6f6c39535cb9bbc943cbbf101ab381d5..a4647eee3c027f20017ac1f47597a6d1f52a2ada 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -48,6 +48,7 @@
 #include  "wx/utils.h"
 #include  "wx/wxchar.h"
 #include  "wx/log.h"
+#include  "wx/thread.h"
 
 // other standard headers
 #include  <errno.h>
@@ -55,9 +56,7 @@
 #include  <time.h>
 
 #ifdef  __WXMSW__
-  #include  <windows.h>
-  // Redefines OutputDebugString if necessary
-  #include  "wx/msw/private.h"
+  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix
@@ -78,26 +77,39 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// implementation of Log functions
-//
-// NB: unfortunately we need all these distinct functions, we can't make them
-//     macros and not all compilers inline vararg functions.
+// globals
 // ----------------------------------------------------------------------------
 
 // log functions can't allocate memory (LogError("out of memory...") should
 // work!), so we use a static buffer for all log messages
 #define LOG_BUFFER_SIZE   (4096)
 
-// static buffer for error messages (FIXME MT-unsafe)
+// static buffer for error messages
 static wxChar s_szBuf[LOG_BUFFER_SIZE];
 
+#if wxUSE_THREADS
+
+// the critical section protecting the static buffer
+static wxCriticalSection gs_csLogBuf;
+
+#endif // wxUSE_THREADS
+
+// ----------------------------------------------------------------------------
+// implementation of Log functions
+//
+// NB: unfortunately we need all these distinct functions, we can't make them
+//     macros and not all compilers inline vararg functions.
+// ----------------------------------------------------------------------------
+
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
   if ( wxLog::GetActiveTarget() != NULL ) {
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
     va_list argptr;
     va_start(argptr, szFormat);
-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf, time(NULL));
@@ -108,9 +120,11 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \
       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \
-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
@@ -129,9 +143,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
 {
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL && pLog->GetVerbose() ) {
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
     va_list argptr;
     va_start(argptr, szFormat);
-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
@@ -144,9 +160,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \
       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \
-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
@@ -158,9 +176,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     wxLog *pLog = wxLog::GetActiveTarget();
 
     if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
       va_list argptr;
       va_start(argptr, szFormat);
-      wxVsprintf(s_szBuf, szFormat, argptr);
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
@@ -175,9 +195,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
       va_list argptr;
       va_start(argptr, szFormat);
-      wxVsprintf(s_szBuf, szFormat, argptr);
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
@@ -198,7 +220,8 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
 void wxLogSysErrorHelper(long lErrCode)
 {
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
-    wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+    wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
+               _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
     wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
@@ -206,9 +229,11 @@ void wxLogSysErrorHelper(long lErrCode)
 
 void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 {
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
     va_list argptr;
     va_start(argptr, szFormat);
-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
     va_end(argptr);
 
     wxLogSysErrorHelper(wxSysErrorCode());
@@ -216,9 +241,11 @@ void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 
 void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 {
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
     va_list argptr;
     va_start(argptr, szFormat);
-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
     va_end(argptr);
 
     wxLogSysErrorHelper(lErrCode);
@@ -320,12 +347,9 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
+        case wxLOG_Status:
         default:    // log unknown log levels too
                 DoLogString(szString, t);
-            // fall through
-
-        case wxLOG_Status:
-            // nothing to do
             break;
 
         case wxLOG_Trace:
@@ -363,15 +387,16 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
-    str << szString << wxT('\n');
+    str << szString;
 
     fputs(str.mb_str(), m_fp);
+    fputc(_T('\n'), m_fp);
     fflush(m_fp);
 
-    // under Windows, programs usually don't have stderr at all, so make show the
-    // messages also under debugger
-#ifdef __WXMSW__
-    OutputDebugString(str + wxT('\r'));
+    // under Windows, programs usually don't have stderr at all, so show the
+    // messages also under debugger - unless it's a console program
+#if defined(__WXMSW__) && wxUSE_GUI
+    OutputDebugString(str + wxT("\r\n"));
 #endif // MSW
 }
 
@@ -561,12 +586,14 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed assert
+    wxSnprintf(szBuf, WXSIZEOF(szBuf),
 #ifdef __VISUALC__
-    wxSprintf(szBuf, wxT("%s(%d): assert failed"), szFile, nLine);
+               wxT("%s(%d): assert failed"),
 #else  // !VC++
     // make the error message more clear for all the others
-    wxSprintf(szBuf, wxT("Assert failed in file %s at line %d"), szFile, nLine);
+               wxT("Assert failed in file %s at line %d"),
 #endif // VC/!VC
+               szFile, nLine);
 
     if ( szMsg != NULL ) {
         wxStrcat(szBuf, wxT(": "));