Remove useless test

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 609e0b51945d8fe36731057d6db22d006f24b1f6..8329c23815279142a8ad413a7b38c5d579d56cde 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -30,10 +30,7 @@
 
 #include <vlc/vlc.h>
 
-#include <stdio.h>                                               /* required */
 #include <stdarg.h>                                       /* va_list for BSD */
-#include <stdlib.h>                                              /* malloc() */
-#include <string.h>                                            /* strerror() */
 
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>                  /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
@@ -304,10 +301,66 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
         return;
     }
 
+#ifndef __GLIBC__
+    /* Expand %m to strerror(errno) - only once */
+    char buf[strlen( psz_format ) + 2001], *ptr;
+    strcpy( buf, psz_format );
+    ptr = psz_format = buf;
+
+    for( ;; )
+    {
+        ptr = strchr( ptr, '%' );
+        if( ptr == NULL )
+            break;
+
+        if( ptr[1] == 'm' )
+        {
+            char errbuf[2001];
+            size_t errlen;
+
+#ifndef WIN32
+            strerror_r( errno, errbuf, 1001 );
+#else
+            int sockerr = WSAGetLastError( );
+            if( sockerr )
+            {
+                strncpy( errbuf, net_strerror( sockerr ), 1001 );
+                WSASetLastError( sockerr );
+            }
+            if ((sockerr == 0)
+             || (strcmp ("Unknown network stack error", errbuf) == 0))
+                strncpy( errbuf, strerror( errno ), 1001 );
+#endif
+            errbuf[1000] = 0;
+
+            /* Escape '%' from the error string */
+            for( char *percent = strchr( errbuf, '%' );
+                 percent != NULL;
+                 percent = strchr( percent + 2, '%' ) )
+            {
+                memmove( percent + 1, percent, strlen( percent ) + 1 );
+            }
+
+            errlen = strlen( errbuf );
+            memmove( ptr + errlen, ptr + 2, strlen( ptr + 2 ) + 1 );
+            memcpy( ptr, errbuf, errlen );
+            break; /* Only once, so we don't overflow */
+        }
+
+        /* Looks for conversion specifier... */
+        do
+            ptr++;
+        while( *ptr && ( strchr( "diouxXeEfFgGaAcspn%", *ptr ) == NULL ) );
+        if( *ptr )
+            ptr++; /* ...and skip it */
+    }
+#endif
+
     /* Convert message to string  */
 #if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS )
     vlc_va_copy( args, _args );
-    vasprintf( &psz_str, psz_format, args );
+    if( vasprintf( &psz_str, psz_format, args ) == -1 )
+        psz_str = NULL;
     va_end( args );
 #else
     psz_str = (char*) malloc( i_size );
@@ -315,8 +368,20 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
 
     if( psz_str == NULL )
     {
-        fprintf( stderr, "main warning: can't store message (%s): ",
-                 strerror(errno) );
+#ifdef __GLIBC__
+        fprintf( stderr, "main warning: can't store message (%m): " );
+#else
+        char *psz_err[1001];
+#ifndef WIN32
+        /* we're not using GLIBC, so we are sure that the error description
+         * will be stored in the buffer we provide to strerror_r() */
+        strerror_r( errno, psz_err, 1001 );
+#else
+        strncpy( psz_err, strerror( errno ), 1001 );
+#endif
+        psz_err[1000] = '\0';
+        fprintf( stderr, "main warning: can't store message (%s): ", psz_err );
+#endif
         vlc_va_copy( args, _args );
         /* We should use utf8_vfprintf - but it calls malloc()... */
         vfprintf( stderr, psz_format, args );
@@ -498,7 +563,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #   define RED     COL(31)
 #   define GREEN   COL(32)
 #   define YELLOW  COL(33)
-#   define WHITE   COL(37)
+#   define WHITE   COL(0)
 #   define GRAY    "\033[0m"
 
 #ifdef UNDER_CE
@@ -599,14 +664,14 @@ void msg_StackSet( int i_code, const char *psz_message, ... )
     va_list ap;
     msg_context_t *p_ctx = GetContext();
     assert( p_ctx );
+
     va_start( ap, psz_message );
-    if( p_ctx->psz_message != NULL )
-    {
-        free( p_ctx->psz_message );
-    }
+    free( p_ctx->psz_message );
 
-    vasprintf( &p_ctx->psz_message, psz_message, ap );
+    if( vasprintf( &p_ctx->psz_message, psz_message, ap ) == -1 )
+        p_ctx->psz_message = NULL;
     va_end( ap );
+
     p_ctx->i_code = i_code;
 }
 
@@ -618,7 +683,8 @@ void msg_StackAdd( const char *psz_message, ... )
     assert( p_ctx );
 
     va_start( ap, psz_message );
-    vasprintf( &psz_tmp, psz_message, ap );
+    if( vasprintf( &psz_tmp, psz_message, ap ) == -1 )
+        psz_tmp = NULL;
     va_end( ap );
 
     if( !p_ctx->psz_message )