Couldn't bootstrap properly if a number existed anywhere in the path

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 73ad695cafe1ff75988528019116a4c2212b93b8..a9a3c479cb14ea90d8b844a748917f3355255b8a 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,6 +301,60 @@ 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 );
+            }
+            else
+                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 );