void unescape_URI( char *psz )
{
unsigned char *in = (unsigned char *)psz, *out = in, c;
+ if( psz == NULL )
+ return;
while( ( c = *in++ ) != '\0' )
{
void decode_URI( char *psz )
{
unsigned char *in = (unsigned char *)psz, *out = in, c;
+ if( psz == NULL )
+ return;
while( ( c = *in++ ) != '\0' )
{
while ( *psz_value )
{
- if( !strncmp( psz_value, "<", 4 ) )
- {
- *p_pos = '<';
- psz_value += 4;
- }
- else if( !strncmp( psz_value, ">", 4 ) )
- {
- *p_pos = '>';
- psz_value += 4;
- }
- else if( !strncmp( psz_value, "&", 5 ) )
- {
- *p_pos = '&';
- psz_value += 5;
- }
- else if( !strncmp( psz_value, """, 6 ) )
+ if( *psz_value == '&' )
{
- *p_pos = '\"';
- psz_value += 6;
- }
- else if( !strncmp( psz_value, "'", 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( "<", 4, '<' )
+ else TRY_CHAR( ">", 4, '>' )
+ else TRY_CHAR( "&", 5, '&' )
+ else TRY_CHAR( """, 6, '"' )
+ else TRY_CHAR( "'", 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( "À", 8, "À" )
+ else TRY_LONGCHAR( "Á", 8, "Á" )
+ else TRY_LONGCHAR( "Â", 7, "Â" )
+ else TRY_LONGCHAR( "Ã", 8, "Ã" )
+ else TRY_LONGCHAR( "Ä", 6, "Ä" )
+ else TRY_LONGCHAR( "Å", 7, "Å" )
+ else TRY_LONGCHAR( "Æ", 7, "Æ" )
+ else TRY_LONGCHAR( "Ç", 8, "Ç" )
+ else TRY_LONGCHAR( "È", 8, "È" )
+ else TRY_LONGCHAR( "É", 8, "É" )
+ else TRY_LONGCHAR( "Ê", 7, "Ê" )
+ else TRY_LONGCHAR( "Ë", 6, "Ë" )
+ else TRY_LONGCHAR( "Ì", 8, "Ì" )
+ else TRY_LONGCHAR( "Í", 8, "Í" )
+ else TRY_LONGCHAR( "Î", 7, "Î" )
+ else TRY_LONGCHAR( "Ï", 6, "Ï" )
+ else TRY_LONGCHAR( "Ð", 5, "Ð" )
+ else TRY_LONGCHAR( "Ñ", 8, "Ñ" )
+ else TRY_LONGCHAR( "Ò", 8, "Ò" )
+ else TRY_LONGCHAR( "Ó", 8, "Ó" )
+ else TRY_LONGCHAR( "Ô", 7, "Ô" )
+ else TRY_LONGCHAR( "Õ", 8, "Õ" )
+ else TRY_LONGCHAR( "Ö", 6, "Ö" )
+ else TRY_LONGCHAR( "Ø", 8, "Ø" )
+ else TRY_LONGCHAR( "Ù", 8, "Ù" )
+ else TRY_LONGCHAR( "Ú", 8, "Ú" )
+ else TRY_LONGCHAR( "Û", 7, "Û" )
+ else TRY_LONGCHAR( "Ü", 6, "Ü" )
+ else TRY_LONGCHAR( "Ý", 8, "Ý" )
+ else TRY_LONGCHAR( "Þ", 7, "Þ" )
+ else TRY_LONGCHAR( "ß", 7, "ß" )
+ else TRY_LONGCHAR( "à", 8, "à" )
+ else TRY_LONGCHAR( "á", 8, "á" )
+ else TRY_LONGCHAR( "â", 7, "â" )
+ else TRY_LONGCHAR( "ã", 8, "ã" )
+ else TRY_LONGCHAR( "ä", 6, "ä" )
+ else TRY_LONGCHAR( "å", 7, "å" )
+ else TRY_LONGCHAR( "æ", 7, "æ" )
+ else TRY_LONGCHAR( "ç", 8, "ç" )
+ else TRY_LONGCHAR( "è", 8, "è" )
+ else TRY_LONGCHAR( "é", 8, "é" )
+ else TRY_LONGCHAR( "ê", 7, "ê" )
+ else TRY_LONGCHAR( "ë", 6, "ë" )
+ else TRY_LONGCHAR( "ì", 8, "ì" )
+ else TRY_LONGCHAR( "í", 8, "í" )
+ else TRY_LONGCHAR( "î", 7, "î" )
+ else TRY_LONGCHAR( "ï", 6, "ï" )
+ else TRY_LONGCHAR( "ð", 5, "ð" )
+ else TRY_LONGCHAR( "ñ", 8, "ñ" )
+ else TRY_LONGCHAR( "ò", 8, "ò" )
+ else TRY_LONGCHAR( "ó", 8, "ó" )
+ else TRY_LONGCHAR( "ô", 7, "ô" )
+ else TRY_LONGCHAR( "õ", 8, "õ" )
+ else TRY_LONGCHAR( "ö", 6, "ö" )
+ else TRY_LONGCHAR( "ø", 8, "ø" )
+ else TRY_LONGCHAR( "ù", 8, "ù" )
+ else TRY_LONGCHAR( "ú", 8, "ú" )
+ else TRY_LONGCHAR( "û", 7, "û" )
+ else TRY_LONGCHAR( "ü", 6, "ü" )
+ else TRY_LONGCHAR( "ý", 8, "ý" )
+ else TRY_LONGCHAR( "þ", 7, "þ" )
+ else TRY_LONGCHAR( "ÿ", 6, "ÿ" )
+ else TRY_LONGCHAR( "¡", 7, "¡" )
+ else TRY_LONGCHAR( "¤", 8, "¤" )
+ else TRY_LONGCHAR( "¢", 6, "¢" )
+ else TRY_LONGCHAR( "£", 7, "£" )
+ else TRY_LONGCHAR( "¥", 5, "¥" )
+ else TRY_LONGCHAR( "¦", 8, "¦" )
+ else TRY_LONGCHAR( "§", 6, "§" )
+ else TRY_LONGCHAR( "¨", 5, "¨" )
+ else TRY_LONGCHAR( "©", 6, "©" )
+ else TRY_LONGCHAR( "ª", 6, "ª" )
+ else TRY_LONGCHAR( "«", 7, "«" )
+ else TRY_LONGCHAR( "¬", 5, "¬" )
+ else TRY_LONGCHAR( "­", 5, "" )
+ else TRY_LONGCHAR( "®", 5, "®" )
+ else TRY_LONGCHAR( "™", 7, "™" )
+ else TRY_LONGCHAR( "¯", 6, "¯" )
+ else TRY_LONGCHAR( "°", 5, "°" )
+ else TRY_LONGCHAR( "±", 8, "±" )
+ else TRY_LONGCHAR( "²", 6, "²" )
+ else TRY_LONGCHAR( "³", 6, "³" )
+ else TRY_LONGCHAR( "´", 7, "´" )
+ else TRY_LONGCHAR( "µ", 7, "µ" )
+ else TRY_LONGCHAR( "¶", 6, "¶" )
+ else TRY_LONGCHAR( "·", 8, "·" )
+ else TRY_LONGCHAR( "¸", 7, "¸" )
+ else TRY_LONGCHAR( "¹", 6, "¹" )
+ else TRY_LONGCHAR( "º", 6, "º" )
+ else TRY_LONGCHAR( "»", 7, "»" )
+ else TRY_LONGCHAR( "¼", 8, "¼" )
+ else TRY_LONGCHAR( "½", 8, "½" )
+ else TRY_LONGCHAR( "¾", 8, "¾" )
+ else TRY_LONGCHAR( "¿", 8, "¿" )
+ else TRY_LONGCHAR( "×", 7, "×" )
+ else TRY_LONGCHAR( "÷", 8, "÷" )
+ else TRY_LONGCHAR( "Œ", 7, "Œ" )
+ else TRY_LONGCHAR( "œ", 7, "œ" )
+ else TRY_LONGCHAR( "Š", 8, "Š" )
+ else TRY_LONGCHAR( "š", 8, "š" )
+ else TRY_LONGCHAR( "Ÿ", 6, "Ÿ" )
+ else TRY_LONGCHAR( "ˆ", 6, "ˆ" )
+ else TRY_LONGCHAR( "˜", 7, "˜" )
+ else TRY_LONGCHAR( "–", 7, "–" )
+ else TRY_LONGCHAR( "—", 7, "—" )
+ else TRY_LONGCHAR( "‘", 7, "‘" )
+ else TRY_LONGCHAR( "’", 7, "’" )
+ else TRY_LONGCHAR( "‚", 7, "‚" )
+ else TRY_LONGCHAR( "“", 7, "“" )
+ else TRY_LONGCHAR( "”", 7, "”" )
+ else TRY_LONGCHAR( "„", 7, "„" )
+ else TRY_LONGCHAR( "†", 8, "†" )
+ else TRY_LONGCHAR( "‡", 8, "‡" )
+ else TRY_LONGCHAR( "…", 8, "…" )
+ else TRY_LONGCHAR( "‰", 8, "‰" )
+ else TRY_LONGCHAR( "‹", 8, "‹" )
+ else TRY_LONGCHAR( "›", 8, "›" )
+ else TRY_LONGCHAR( "€", 6, "€" )
+ else
+ {
+ *p_pos = *psz_value;
+ psz_value++;
+ }
}
else
{
}
#define INSERT_STRING( check, string ) \
- if( check && string ) \
+ if( check ) \
{ \
- int len = strlen( string ); \
- dst = realloc( dst, \
- i_size = i_size + len + 1 ); \
- strncpy( d, string, len+1 ); \
- d += len; \
- } \
- else \
- { \
- *d = '-'; \
- d++; \
+ psz_meta = string; \
+ if( string ) \
+ { \
+ int len = strlen( psz_meta ); \
+ dst = realloc( dst, \
+ i_size = i_size + len + 1 ); \
+ strncpy( d, psz_meta, len+1 ); \
+ d += len; \
+ free( psz_meta ); \
+ } \
+ else \
+ { \
+ *d = '-'; \
+ d++; \
+ } \
}
char *__str_format_meta( vlc_object_t *p_object, const char *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 );
{
switch( *s )
{
+ char *psz_meta; /* used by INSERT_STRING */
case 'a':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_artist );
+ INSERT_STRING( p_item, input_item_GetArtist(p_item) );
break;
case 'b':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_album );
+ INSERT_STRING( p_item, input_item_GetAlbum(p_item) );
break;
case 'c':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_copyright );
+ INSERT_STRING( p_item, input_item_GetCopyright(p_item) );
break;
case 'd':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_description );
+ INSERT_STRING( p_item, input_item_GetDescription(p_item) );
break;
case 'e':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_encodedby );
+ INSERT_STRING( p_item, input_item_GetEncodedBy(p_item) );
break;
case 'g':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_genre );
+ INSERT_STRING( p_item, input_item_GetGenre(p_item) );
break;
case 'l':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_language );
+ INSERT_STRING( p_item, input_item_GetLanguage(p_item) );
break;
case 'n':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_tracknum );
+ INSERT_STRING( p_item, input_item_GetTrackNum(p_item) );
break;
case 'p':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_nowplaying );
+ INSERT_STRING( p_item, input_item_GetNowPlaying(p_item) );
break;
case 'r':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_rating );
+ INSERT_STRING( p_item, input_item_GetRating(p_item) );
break;
case 's':
{
}
else
{
- lang = strdup( "-" );
+ lang = strdup( b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, lang );
free( lang );
break;
}
case 't':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_title );
+ INSERT_STRING( p_item, input_item_GetTitle(p_item) );
break;
case 'u':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_url );
+ INSERT_STRING( p_item, input_item_GetURL(p_item) );
break;
case 'A':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_date );
+ INSERT_STRING( p_item, input_item_GetDate(p_item) );
break;
case 'B':
if( p_input )
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- lang = strdup( "-" );
+ lang = strdup( b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, lang );
free( lang );
}
else
{
- sprintf( buf, "--.-%%" );
+ sprintf( buf, b_empty_if_na ? "" : "--.-%%" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "-" );
+ sprintf( buf, b_empty_if_na ? "" : "-" );
}
INSERT_STRING( 1, buf );
break;
}
else
{
- sprintf( buf, "--:--:--" );
+ sprintf( buf, b_empty_if_na ? "" : "--:--:--" );
}
INSERT_STRING( 1, buf );
break;
case 'U':
- INSERT_STRING( p_item && p_item->p_meta,
- p_item->p_meta->psz_publisher );
+ INSERT_STRING( p_item, input_item_GetPublisher(p_item) );
break;
case 'V':
{
d++;
break;
+ case ' ':
+ b_empty_if_na = 1;
+ break;
+
default:
*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
{
void path_sanitize( char *str )
{
#if 0
- Uncomment the two blocks to prevent /../ or /./, i'm not sure that we
- want to.
+ /*
+ * Uncomment the two blocks to prevent /../ or /./, i'm not sure that we
+ * want to.
+ */
char *prev = str - 1;
+#endif
+#ifdef WIN32
+ /* check drive prefix if path is absolute */
+ if( isalpha(*str) && (':' == *(str+1)) )
+ str += 2;
#endif
while( *str )
{