X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=5020a198aa539c3d44bba8423174db67dde9263b;hb=21720e09b3b624c8f7f5a342d9ac703de074154d;hp=9ccbe4912195b254162935172f73abce5a58879b;hpb=267cd7f9b7dac986e6d2bc490f778107be95a8fc;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 9ccbe49121..5020a198aa 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -28,12 +28,13 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include /* required */ #include /* va_list for BSD */ -#include /* malloc() */ -#include /* strerror() */ #ifdef HAVE_FCNTL_H # include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ @@ -47,8 +48,7 @@ #include -#include "vlc_interface.h" -#include "charset.h" +#include /***************************************************************************** * Local macros @@ -79,21 +79,20 @@ static void PrintMsg ( vlc_object_t *, msg_item_t * ); */ void __msg_Create( vlc_object_t *p_this ) { - vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); - -#define QUEUE_INIT(i) \ - vlc_mutex_init( p_this, &QUEUE(i).lock ); \ - QUEUE(i).b_overflow = VLC_FALSE; \ - QUEUE(i).i_id = i; \ - QUEUE(i).i_start = 0; \ - QUEUE(i).i_stop = 0; \ - QUEUE(i).i_sub = 0; \ - QUEUE(i).pp_sub = 0; - - QUEUE_INIT( 0 ); - QUEUE_INIT( 1 ); + int i; + vlc_mutex_init( (vlc_object_t *)NULL, + &(p_this->p_libvlc->msg_bank.lock) ); -#undef QUEUE_INIT + for( i = 0; i < 2; i++ ) + { + vlc_mutex_init( (vlc_object_t *)NULL, &QUEUE(i).lock ); + QUEUE(i).b_overflow = VLC_FALSE; + QUEUE(i).i_id = i; + QUEUE(i).i_start = 0; + QUEUE(i).i_stop = 0; + QUEUE(i).i_sub = 0; + QUEUE(i).pp_sub = 0; + } #ifdef UNDER_CE QUEUE(MSG_QUEUE_NORMAL).logfile = @@ -252,7 +251,7 @@ void __msg_GenericVa( vlc_object_t *p_this, int i_queue, { \ va_list args; \ va_start( args, psz_format ); \ - QueueMsg( (vlc_object_t *)p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \ + QueueMsg( p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \ psz_format, args ); \ va_end( args ); \ } \ @@ -301,25 +300,103 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE; #endif - if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET || - (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) + if( p_this == NULL ) { +#ifndef NDEBUG + if( i_type == VLC_MSG_DBG ) + return; +#endif + utf8_vfprintf( stderr, psz_format, _args ); + fputc ('\n', stderr); return; } + if( p_this->i_flags & OBJECT_FLAGS_QUIET || + (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) + return; + +#ifndef __GLIBC__ + /* Expand %m to strerror(errno) - only once */ + char buf[strlen( psz_format ) + 2001], *ptr; + strcpy( buf, psz_format ); + ptr = (char*)buf; + psz_format = (const char*) 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 * sizeof(char) ); + psz_str = (char*) malloc( i_size ); #endif 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 ); @@ -501,7 +578,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 @@ -584,3 +661,65 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) # endif #endif } + +static msg_context_t* GetContext(void) +{ + msg_context_t *p_ctx = vlc_threadvar_get( &msg_context_global_key ); + if( p_ctx == NULL ) + { + MALLOC_NULL( p_ctx, msg_context_t ); + p_ctx->psz_message = NULL; + vlc_threadvar_set( &msg_context_global_key, p_ctx ); + } + return p_ctx; +} + +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 ); + free( p_ctx->psz_message ); + + if( vasprintf( &p_ctx->psz_message, psz_message, ap ) == -1 ) + p_ctx->psz_message = NULL; + va_end( ap ); + + p_ctx->i_code = i_code; +} + +void msg_StackAdd( const char *psz_message, ... ) +{ + char *psz_tmp; + va_list ap; + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + + va_start( ap, psz_message ); + if( vasprintf( &psz_tmp, psz_message, ap ) == -1 ) + psz_tmp = NULL; + va_end( ap ); + + if( !p_ctx->psz_message ) + p_ctx->psz_message = psz_tmp; + else + { + char *psz_old = malloc( strlen( p_ctx->psz_message ) + 1 ); + memcpy( psz_old, p_ctx->psz_message, strlen( p_ctx->psz_message ) + 1 ); + p_ctx->psz_message = realloc( p_ctx->psz_message, + strlen( p_ctx->psz_message ) + + /* ':', ' ', '0' */ + strlen( psz_tmp ) + 3 ); + sprintf( p_ctx->psz_message, "%s: %s", psz_tmp, psz_old ); + free( psz_tmp ); free( psz_old ); + } +} + +const char* msg_StackMsg( void ) +{ + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + return p_ctx->psz_message; +}