X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftext%2Fstrings.c;h=5d1395782375435cf10a18dedb84537c235b7578;hb=b99613a3e91faf43a090c46176c046a5844ef820;hp=8da2e33f2457243b770edce78885c375f11315cf;hpb=d2910851e0b1feb21b3c3c453703995f10dd0348;p=vlc

diff --git a/src/text/strings.c b/src/text/strings.c
index 8da2e33f24..5d13957823 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -26,10 +26,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <assert.h>
 
 /* Needed by str_format_time */
@@ -63,6 +64,8 @@ char *unescape_URI_duplicate( const char *psz )
 void unescape_URI( char *psz )
 {
     unsigned char *in = (unsigned char *)psz, *out = in, c;
+    if( psz == NULL )
+        return;
 
     while( ( c = *in++ ) != '\0' )
     {
@@ -144,6 +147,8 @@ char *decode_URI_duplicate( const char *psz )
 void decode_URI( char *psz )
 {
     unsigned char *in = (unsigned char *)psz, *out = in, c;
+    if( psz == NULL )
+        return;
 
     while( ( c = *in++ ) != '\0' )
     {
@@ -242,30 +247,174 @@ void resolve_xml_special_chars( char *psz_value )
 
     while ( *psz_value )
     {
-        if( !strncmp( psz_value, "&lt;", 4 ) )
-        {
-            *p_pos = '<';
-            psz_value += 4;
-        }
-        else if( !strncmp( psz_value, "&gt;", 4 ) )
-        {
-            *p_pos = '>';
-            psz_value += 4;
-        }
-        else if( !strncmp( psz_value, "&amp;", 5 ) )
-        {
-            *p_pos = '&';
-            psz_value += 5;
-        }
-        else if( !strncmp( psz_value, "&quot;", 6 ) )
+        if( *psz_value == '&' )
         {
-            *p_pos = '\"';
-            psz_value += 6;
-        }
-        else if( !strncmp( psz_value, "&#039;", 6 ) )
-        {
-            *p_pos = '\'';
-            psz_value += 6;
+#define TRY_CHAR( src, len, dst )                   \
+            if( !strncmp( psz_value, src, len ) )   \
+            {                                       \
+                *p_pos = dst;                       \
+                psz_value += len;                   \
+            }
+#define TRY_LONGCHAR( src, len, dst )                   \
+            if( !strncmp( psz_value, src, len ) )       \
+            {                                           \
+                strncpy( p_pos, dst, strlen( dst ) );   \
+                p_pos += strlen( dst ) - 1;             \
+                psz_value += len;                       \
+            }
+            TRY_CHAR( "&lt;", 4, '<' )
+            else TRY_CHAR( "&gt;", 4, '>' )
+            else TRY_CHAR( "&amp;", 5, '&' )
+            else TRY_CHAR( "&quot;", 6, '"' )
+            else TRY_CHAR( "&apos;", 6, '\'' )
+            else if( psz_value[1] == '#' )
+            {
+                char *psz_end;
+                int i = strtol( psz_value+2, &psz_end, 10 );
+                if( *psz_end == ';' )
+                {
+                    if( i >= 32 && i <= 126 )
+                    {
+                        *p_pos = (char)i;
+                        psz_value = psz_end+1;
+                    }
+                    else
+                    {
+                        /* Unhandled code, FIXME */
+                        *p_pos = *psz_value;
+                        psz_value++;
+                    }
+                }
+                else
+                {
+                    /* Invalid entity number */
+                    *p_pos = *psz_value;
+                    psz_value++;
+                }
+            }
+            else TRY_LONGCHAR( "&Agrave;", 8, "À" )
+            else TRY_LONGCHAR( "&Aacute;", 8, "Á" )
+            else TRY_LONGCHAR( "&Acirc;", 7, "Â" )
+            else TRY_LONGCHAR( "&Atilde;", 8, "Ã" )
+            else TRY_LONGCHAR( "&Auml;", 6, "Ä" )
+            else TRY_LONGCHAR( "&Aring;", 7, "Å" )
+            else TRY_LONGCHAR( "&AElig;", 7, "Æ" )
+            else TRY_LONGCHAR( "&Ccedil;", 8, "Ç" )
+            else TRY_LONGCHAR( "&Egrave;", 8, "È" )
+            else TRY_LONGCHAR( "&Eacute;", 8, "É" )
+            else TRY_LONGCHAR( "&Ecirc;", 7, "Ê" )
+            else TRY_LONGCHAR( "&Euml;", 6, "Ë" )
+            else TRY_LONGCHAR( "&Igrave;", 8, "Ì" )
+            else TRY_LONGCHAR( "&Iacute;", 8, "Í" )
+            else TRY_LONGCHAR( "&Icirc;", 7, "Î" )
+            else TRY_LONGCHAR( "&Iuml;", 6, "Ï" )
+            else TRY_LONGCHAR( "&ETH;", 5, "Ð" )
+            else TRY_LONGCHAR( "&Ntilde;", 8, "Ñ" )
+            else TRY_LONGCHAR( "&Ograve;", 8, "Ò" )
+            else TRY_LONGCHAR( "&Oacute;", 8, "Ó" )
+            else TRY_LONGCHAR( "&Ocirc;", 7, "Ô" )
+            else TRY_LONGCHAR( "&Otilde;", 8, "Õ" )
+            else TRY_LONGCHAR( "&Ouml;", 6, "Ö" )
+            else TRY_LONGCHAR( "&Oslash;", 8, "Ø" )
+            else TRY_LONGCHAR( "&Ugrave;", 8, "Ù" )
+            else TRY_LONGCHAR( "&Uacute;", 8, "Ú" )
+            else TRY_LONGCHAR( "&Ucirc;", 7, "Û" )
+            else TRY_LONGCHAR( "&Uuml;", 6, "Ü" )
+            else TRY_LONGCHAR( "&Yacute;", 8, "Ý" )
+            else TRY_LONGCHAR( "&THORN;", 7, "Þ" )
+            else TRY_LONGCHAR( "&szlig;", 7, "ß" )
+            else TRY_LONGCHAR( "&agrave;", 8, "à" )
+            else TRY_LONGCHAR( "&aacute;", 8, "á" )
+            else TRY_LONGCHAR( "&acirc;", 7, "â" )
+            else TRY_LONGCHAR( "&atilde;", 8, "ã" )
+            else TRY_LONGCHAR( "&auml;", 6, "ä" )
+            else TRY_LONGCHAR( "&aring;", 7, "Ã¥" )
+            else TRY_LONGCHAR( "&aelig;", 7, "æ" )
+            else TRY_LONGCHAR( "&ccedil;", 8, "ç" )
+            else TRY_LONGCHAR( "&egrave;", 8, "è" )
+            else TRY_LONGCHAR( "&eacute;", 8, "é" )
+            else TRY_LONGCHAR( "&ecirc;", 7, "ê" )
+            else TRY_LONGCHAR( "&euml;", 6, "ë" )
+            else TRY_LONGCHAR( "&igrave;", 8, "ì" )
+            else TRY_LONGCHAR( "&iacute;", 8, "í" )
+            else TRY_LONGCHAR( "&icirc;", 7, "î" )
+            else TRY_LONGCHAR( "&iuml;", 6, "ï" )
+            else TRY_LONGCHAR( "&eth;", 5, "ð" )
+            else TRY_LONGCHAR( "&ntilde;", 8, "ñ" )
+            else TRY_LONGCHAR( "&ograve;", 8, "ò" )
+            else TRY_LONGCHAR( "&oacute;", 8, "ó" )
+            else TRY_LONGCHAR( "&ocirc;", 7, "ô" )
+            else TRY_LONGCHAR( "&otilde;", 8, "õ" )
+            else TRY_LONGCHAR( "&ouml;", 6, "ö" )
+            else TRY_LONGCHAR( "&oslash;", 8, "ø" )
+            else TRY_LONGCHAR( "&ugrave;", 8, "ù" )
+            else TRY_LONGCHAR( "&uacute;", 8, "ú" )
+            else TRY_LONGCHAR( "&ucirc;", 7, "û" )
+            else TRY_LONGCHAR( "&uuml;", 6, "ü" )
+            else TRY_LONGCHAR( "&yacute;", 8, "ý" )
+            else TRY_LONGCHAR( "&thorn;", 7, "þ" )
+            else TRY_LONGCHAR( "&yuml;", 6, "ÿ" )
+            else TRY_LONGCHAR( "&iexcl;", 7, "¡" )
+            else TRY_LONGCHAR( "&curren;", 8, "¤" )
+            else TRY_LONGCHAR( "&cent;", 6, "¢" )
+            else TRY_LONGCHAR( "&pound;", 7, "£" )
+            else TRY_LONGCHAR( "&yen;", 5, "Â¥" )
+            else TRY_LONGCHAR( "&brvbar;", 8, "¦" )
+            else TRY_LONGCHAR( "&sect;", 6, "§" )
+            else TRY_LONGCHAR( "&uml;", 5, "¨" )
+            else TRY_LONGCHAR( "&copy;", 6, "©" )
+            else TRY_LONGCHAR( "&ordf;", 6, "ª" )
+            else TRY_LONGCHAR( "&laquo;", 7, "«" )
+            else TRY_LONGCHAR( "&not;", 5, "¬" )
+            else TRY_LONGCHAR( "&shy;", 5, "­" )
+            else TRY_LONGCHAR( "&reg;", 5, "®" )
+            else TRY_LONGCHAR( "&trade;", 7, "™" )
+            else TRY_LONGCHAR( "&macr;", 6, "¯" )
+            else TRY_LONGCHAR( "&deg;", 5, "°" )
+            else TRY_LONGCHAR( "&plusmn;", 8, "±" )
+            else TRY_LONGCHAR( "&sup2;", 6, "²" )
+            else TRY_LONGCHAR( "&sup3;", 6, "³" )
+            else TRY_LONGCHAR( "&acute;", 7, "´" )
+            else TRY_LONGCHAR( "&micro;", 7, "µ" )
+            else TRY_LONGCHAR( "&para;", 6, "¶" )
+            else TRY_LONGCHAR( "&middot;", 8, "·" )
+            else TRY_LONGCHAR( "&cedil;", 7, "¸" )
+            else TRY_LONGCHAR( "&sup1;", 6, "¹" )
+            else TRY_LONGCHAR( "&ordm;", 6, "º" )
+            else TRY_LONGCHAR( "&raquo;", 7, "»" )
+            else TRY_LONGCHAR( "&frac14;", 8, "¼" )
+            else TRY_LONGCHAR( "&frac12;", 8, "½" )
+            else TRY_LONGCHAR( "&frac34;", 8, "¾" )
+            else TRY_LONGCHAR( "&iquest;", 8, "¿" )
+            else TRY_LONGCHAR( "&times;", 7, "×" )
+            else TRY_LONGCHAR( "&divide;", 8, "÷" )
+            else TRY_LONGCHAR( "&OElig;", 7, "Œ" )
+            else TRY_LONGCHAR( "&oelig;", 7, "œ" )
+            else TRY_LONGCHAR( "&Scaron;", 8, "Å " )
+            else TRY_LONGCHAR( "&scaron;", 8, "Å¡" )
+            else TRY_LONGCHAR( "&Yuml;", 6, "Ÿ" )
+            else TRY_LONGCHAR( "&circ;", 6, "ˆ" )
+            else TRY_LONGCHAR( "&tilde;", 7, "˜" )
+            else TRY_LONGCHAR( "&ndash;", 7, "–" )
+            else TRY_LONGCHAR( "&mdash;", 7, "—" )
+            else TRY_LONGCHAR( "&lsquo;", 7, "‘" )
+            else TRY_LONGCHAR( "&rsquo;", 7, "’" )
+            else TRY_LONGCHAR( "&sbquo;", 7, "‚" )
+            else TRY_LONGCHAR( "&ldquo;", 7, "“" )
+            else TRY_LONGCHAR( "&rdquo;", 7, "”" )
+            else TRY_LONGCHAR( "&bdquo;", 7, "„" )
+            else TRY_LONGCHAR( "&dagger;", 8, "†" )
+            else TRY_LONGCHAR( "&Dagger;", 8, "‡" )
+            else TRY_LONGCHAR( "&hellip;", 8, "…" )
+            else TRY_LONGCHAR( "&permil;", 8, "‰" )
+            else TRY_LONGCHAR( "&lsaquo;", 8, "‹" )
+            else TRY_LONGCHAR( "&rsaquo;", 8, "›" )
+            else TRY_LONGCHAR( "&euro;", 6, "€" )
+            else
+            {
+                *p_pos = *psz_value;
+                psz_value++;
+            }
         }
         else
         {
@@ -410,7 +559,7 @@ size_t vlc_b64_decode_binary_to_buffer( uint8_t *p_dst, size_t i_dst, const char
     int i_level;
     int i_last;
 
-    for( i_level = 0, i_last = 0; i_dst > 0 && *p != '\0'; i_dst--, p++ )
+    for( i_level = 0, i_last = 0; (size_t)( p_dst - p_start ) < i_dst && *p != '\0'; p++ )
     {
         const int c = b64[(unsigned int)*p];
         if( c == -1 )
@@ -469,63 +618,60 @@ char *str_format_time( const char *tformat )
 {
     char buffer[255];
     time_t curtime;
-#if defined(HAVE_LOCALTIME_R)
     struct tm loctime;
-#else
-    struct tm *loctime;
-#endif
 
     /* Get the current time.  */
     curtime = time( NULL );
 
     /* Convert it to local time representation.  */
-#if defined(HAVE_LOCALTIME_R)
     localtime_r( &curtime, &loctime );
     strftime( buffer, 255, tformat, &loctime );
-#else
-    loctime = localtime( &curtime );
-    strftime( buffer, 255, tformat, loctime );
-#endif
     return strdup( buffer );
 }
 
-#define INSERT_STRING( check, string )                              \
-                    if( check && string )                           \
+#define INSERT_STRING( string )                                     \
+                    if( string != NULL )                            \
                     {                                               \
                         int len = strlen( string );                 \
-                        dst = realloc( dst,                         \
-                                       i_size = i_size + len + 1 ); \
-                        strncpy( d, string, len+1 );                \
+                        dst = realloc( dst, i_size = i_size + len );\
+                        memcpy( (dst+d), string, len );             \
                         d += len;                                   \
+                        free( string );                             \
                     }                                               \
                     else                                            \
                     {                                               \
-                        *d = '-';                                   \
+                        *(dst+d) = '-';                             \
                         d++;                                        \
+                    }                                               \
+
+/* same than INSERT_STRING, except that string won't be freed */
+#define INSERT_STRING_NO_FREE( string )                             \
+                    {                                               \
+                        int len = strlen( string );                 \
+                        dst = realloc( dst, i_size = i_size + len );\
+                        memcpy( dst+d, string, len );               \
+                        d += len;                                   \
                     }
 char *__str_format_meta( vlc_object_t *p_object, const char *string )
 {
     const char *s = string;
-    char *dst = malloc( 1000 );
-    char *d = dst;
     int b_is_format = 0;
+    int b_empty_if_na = 0;
     char buf[10];
-    int i_size = strlen( string );
+    int i_size = strlen( string ) + 1; /* +1 to store '\0' */
+    char *dst = strdup( string );
+    if( !dst ) return NULL;
+    int d = 0;
 
     playlist_t *p_playlist = pl_Yield( p_object );
-    input_thread_t *p_input = p_playlist->p_input;
+    input_thread_t *p_input = playlist_CurrentInput( p_playlist );
     input_item_t *p_item = NULL;
     pl_Release( p_object );
     if( p_input )
     {
-        vlc_object_yield( p_input );
         p_item = input_GetItem(p_input);
-        if( p_item )
-            vlc_mutex_lock( &p_item->lock );
     }
 
-    sprintf( dst, string );
-
     while( *s )
     {
         if( b_is_format )
@@ -533,71 +679,104 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
             switch( *s )
             {
                 case 'a':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_artist );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetArtist( p_item ) );
+                    }
                     break;
                 case 'b':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_album );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetAlbum( p_item ) );
+                    }
                     break;
                 case 'c':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_copyright );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetCopyright( p_item ) );
+                    }
                     break;
                 case 'd':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_description );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetDescription( p_item ) );
+                    }
                     break;
                 case 'e':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_encodedby );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetEncodedBy( p_item ) );
+                    }
+                    break;
+                case 'f':
+                    if( p_item && p_item->p_stats )
+                    {
+                        snprintf( buf, 10, "%d",
+                                  p_item->p_stats->i_displayed_pictures );
+                    }
+                    else
+                    {
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
+                    }
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'g':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_genre );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetGenre( p_item ) );
+                    }
                     break;
                 case 'l':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_language );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetLanguage( p_item ) );
+                    }
                     break;
                 case 'n':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_tracknum );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetTrackNum( p_item ) );
+                    }
                     break;
                 case 'p':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_nowplaying );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetNowPlaying( p_item ) );
+                    }
                     break;
                 case 'r':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_rating );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetRating( p_item ) );
+                    }
                     break;
                 case 's':
                 {
-                    char *lang;
+                    char *lang = NULL;
                     if( p_input )
-                    {
-                        lang = var_GetString( p_input, "sub-language" );
-                    }
-                    else
-                    {
-                        lang = strdup( "-" );
-                    }
-                    INSERT_STRING( 1, lang );
-                    free( lang );
+                        lang = var_GetNonEmptyString( p_input, "sub-language" );
+                    if( lang == NULL )
+                        lang = strdup( b_empty_if_na ? "" : "-" );
+                    INSERT_STRING( lang );
                     break;
                 }
                 case 't':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_title );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetTitle( p_item ) );
+                    }
                     break;
                 case 'u':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_url );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetURL( p_item ) );
+                    }
                     break;
                 case 'A':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_date );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetDate( p_item ) );
+                    }
                     break;
                 case 'B':
                     if( p_input )
@@ -607,9 +786,9 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "-" );
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'C':
                     if( p_input )
@@ -619,26 +798,30 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "-" );
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'D':
                     if( p_item )
                     {
+                        mtime_t i_duration = input_item_GetDuration( p_item );
                         sprintf( buf, "%02d:%02d:%02d",
-                                 (int)(p_item->i_duration/(3600000000)),
-                                 (int)((p_item->i_duration/(60000000))%60),
-                                 (int)((p_item->i_duration/1000000)%60) );
+                                 (int)(i_duration/(3600000000)),
+                                 (int)((i_duration/(60000000))%60),
+                                 (int)((i_duration/1000000)%60) );
                     }
                     else
                     {
-                        sprintf( buf, "--:--:--" );
+                        sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'F':
-                    INSERT_STRING( p_item, p_item->psz_uri );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetURI( p_item ) );
+                    }
                     break;
                 case 'I':
                     if( p_input )
@@ -648,40 +831,41 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "-" );
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'L':
                     if( p_item && p_input )
                     {
+                        mtime_t i_duration = input_item_GetDuration( p_item );
+                        int64_t i_time = p_input->i_time;
                         sprintf( buf, "%02d:%02d:%02d",
-                     (int)((p_item->i_duration-p_input->i_time)/(3600000000)),
-                     (int)(((p_item->i_duration-p_input->i_time)/(60000000))%60),
-                     (int)(((p_item->i_duration-p_input->i_time)/1000000)%60) );
+                     (int)( ( i_duration - i_time ) / 3600000000 ),
+                     (int)( ( ( i_duration - i_time ) / 60000000 ) % 60 ),
+                     (int)( ( ( i_duration - i_time ) / 1000000 ) % 60 ) );
                     }
                     else
                     {
-                        sprintf( buf, "--:--:--" );
+                        sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'N':
-                    INSERT_STRING( p_item, p_item->psz_name );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetName( p_item ) );
+                    }
                     break;
                 case 'O':
                 {
-                    char *lang;
+                    char *lang = NULL;
                     if( p_input )
-                    {
-                        lang = var_GetString( p_input, "audio-language" );
-                    }
-                    else
-                    {
-                        lang = strdup( "-" );
-                    }
-                    INSERT_STRING( 1, lang );
-                    free( lang );
+                        lang = var_GetNonEmptyString( p_input,
+                                                      "audio-language" );
+                    if( lang == NULL )
+                        lang = strdup( b_empty_if_na ? "" : "-" );
+                    INSERT_STRING( lang );
                     break;
                 }
                 case 'P':
@@ -692,9 +876,9 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "--.-%%" );
+                        sprintf( buf, b_empty_if_na ? "" : "--.-%%" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'R':
                     if( p_input )
@@ -704,9 +888,9 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "-" );
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'S':
                     if( p_input )
@@ -716,67 +900,71 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
                     }
                     else
                     {
-                        sprintf( buf, "-" );
+                        sprintf( buf, b_empty_if_na ? "" : "-" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'T':
                     if( p_input )
                     {
                         sprintf( buf, "%02d:%02d:%02d",
-                                 (int)(p_input->i_time/(3600000000)),
-                                 (int)((p_input->i_time/(60000000))%60),
-                                 (int)((p_input->i_time/1000000)%60) );
+                            (int)( p_input->i_time / ( 3600000000 ) ),
+                            (int)( ( p_input->i_time / ( 60000000 ) ) % 60 ),
+                            (int)( ( p_input->i_time / 1000000 ) % 60 ) );
                     }
                     else
                     {
-                        sprintf( buf, "--:--:--" );
+                        sprintf( buf, b_empty_if_na ? "" :  "--:--:--" );
                     }
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 case 'U':
-                    INSERT_STRING( p_item && p_item->p_meta,
-                                   p_item->p_meta->psz_publisher );
+                    if( p_item )
+                    {
+                        INSERT_STRING( input_item_GetPublisher( p_item ) );
+                    }
                     break;
                 case 'V':
                 {
                     audio_volume_t volume;
                     aout_VolumeGet( p_object, &volume );
                     snprintf( buf, 10, "%d", volume );
-                    INSERT_STRING( 1, buf );
+                    INSERT_STRING_NO_FREE( buf );
                     break;
                 }
                 case '_':
-                    *d = '\n';
+                    *(dst+d) = '\n';
                     d++;
                     break;
 
+                case ' ':
+                    b_empty_if_na = 1;
+                    break;
+
                 default:
-                    *d = *s;
+                    *(dst+d) = *s;
                     d++;
                     break;
             }
-            b_is_format = 0;
+            if( *s != ' ' )
+                b_is_format = 0;
         }
         else if( *s == '$' )
         {
             b_is_format = 1;
+            b_empty_if_na = 0;
         }
         else
         {
-            *d = *s;
+            *(dst+d) = *s;
             d++;
         }
         s++;
     }
-    *d = '\0';
+    *(dst+d) = '\0';
 
     if( p_input )
-    {
         vlc_object_release( p_input );
-        if( p_item )
-            vlc_mutex_unlock( &p_item->lock );
-    }
 
     return dst;
 }
@@ -813,7 +1001,9 @@ void filename_sanitize( char *str )
         switch( *str )
         {
             case '/':
-#ifdef WIN32
+#if defined( __APPLE__ )
+            case ':':
+#elif defined( WIN32 )
             case '\\':
             case '*':
             case '"':
@@ -848,7 +1038,10 @@ void path_sanitize( char *str )
 #endif
     while( *str )
     {
-#ifdef WIN32
+#if defined( __APPLE__ )
+        if( *str == ':' )
+            *str = '_';
+#elif defined( WIN32 )
         switch( *str )
         {
             case '*':