#include <vlc_input.h>
#include <vlc_meta.h>
#include <vlc_playlist.h>
-#include <vlc_aout.h>
+#include <vlc_aout_intf.h>
#include <vlc_strings.h>
#include <vlc_url.h>
#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include <libvlc.h>
+#include <errno.h>
/**
* Decode encoded URI component. See also decode_URI().
}
/**
- * Encodes an URI component (RFC3986 §2).
+ * Encodes a URI component (RFC3986 §2).
*
* @param psz_uri nul-terminated UTF-8 representation of the component.
- * Obviously, you can't pass an URI containing a nul character, but you don't
+ * Obviously, you can't pass a URI containing a nul character, but you don't
* want to do that, do you?
*
* @return encoded string (must be free()'d), or NULL for ENOMEM.
}
/**
- * Converts '<', '>', '\"', '\'' and '&' to their html entities
- * \param psz_content simple element content that is to be converted
+ * XML-encode an UTF-8 string
+ * \param str nul-terminated UTF-8 byte sequence to XML-encode
+ * \return XML encoded string or NULL on error
+ * (errno is set to ENOMEM or EILSEQ as appropriate)
*/
-char *convert_xml_special_chars( const char *psz_content )
+char *convert_xml_special_chars (const char *str)
{
- assert( psz_content );
+ assert (str != NULL);
- const size_t len = strlen( psz_content );
- char *const psz_temp = malloc( 6 * len + 1 );
- char *p_to = psz_temp;
-
- if( psz_temp == NULL )
+ const size_t len = strlen (str);
+ char *const buf = malloc (6 * len + 1), *ptr = buf;
+ if (unlikely(buf == NULL))
return NULL;
- for( size_t i = 0; i < len; i++ )
+
+ size_t n;
+ uint32_t cp;
+
+ while ((n = vlc_towc (str, &cp)) != 0)
{
- const char *str;
- char c = psz_content[i];
+ if (unlikely(n == (size_t)-1))
+ {
+ free (buf);
+ errno = EILSEQ;
+ return NULL;
+ }
- switch ( c )
+ if ((cp & ~0x0080) < 32 /* C0/C1 control codes */
+ && strchr ("\x09\x0A\x0D\x85", cp) == NULL)
+ ptr += sprintf (ptr, "&#%"PRIu32";", cp);
+ else
+ switch (cp)
{
- case '\"': str = "quot"; break;
- case '&': str = "amp"; break;
- case '\'': str = "#39"; break;
- case '<': str = "lt"; break;
- case '>': str = "gt"; break;
- default:
- *(p_to++) = c;
- continue;
+ case '\"': strcpy (ptr, """); ptr += 6; break;
+ case '&': strcpy (ptr, "&"); ptr += 5; break;
+ case '\'': strcpy (ptr, "'"); ptr += 5; break;
+ case '<': strcpy (ptr, "<"); ptr += 4; break;
+ case '>': strcpy (ptr, ">"); ptr += 4; break;
+ default: memcpy (ptr, str, n); ptr += n; break;
}
- p_to += sprintf( p_to, "&%s;", str );
+ str += n;
}
- *(p_to++) = '\0';
+ *(ptr++) = '\0';
- p_to = realloc( psz_temp, p_to - psz_temp );
- return p_to ? p_to : psz_temp; /* cannot fail */
+ ptr = realloc (buf, ptr - buf);
+ return likely(ptr != NULL) ? ptr : buf; /* cannot fail */
}
/* Base64 encoding */
memcpy( (dst+d), string, len ); \
d += len; \
free( string ); \
- } \
- else if( !b_empty_if_na ) \
- { \
- *(dst+d) = '-'; \
- d++; \
- } \
+ }
/* same than INSERT_STRING, except that string won't be freed */
#define INSERT_STRING_NO_FREE( string ) \
}
break;
case 's':
- {
- char *lang = NULL;
- if( p_input )
- lang = var_GetNonEmptyString( p_input, "sub-language" );
- if( lang == NULL )
- lang = strdup( b_empty_if_na ? "" : "-" );
- INSERT_STRING( lang );
- break;
- }
+ {
+ char *psz_lang = NULL;
+ if( p_input )
+ psz_lang = var_GetNonEmptyString( p_input, "sub-language" );
+ if( psz_lang == NULL )
+ psz_lang = strdup( b_empty_if_na ? "" : "-" );
+ INSERT_STRING( psz_lang );
+ break;
+ }
case 't':
if( p_item )
{
}
break;
case 'O':
- {
- char *lang = NULL;
- if( p_input )
- lang = var_GetNonEmptyString( p_input,
- "audio-language" );
- if( lang == NULL )
- lang = strdup( b_empty_if_na ? "" : "-" );
- INSERT_STRING( lang );
- break;
- }
+ {
+ char *lang = NULL;
+ if( p_input )
+ lang = var_GetNonEmptyString( p_input,
+ "audio-language" );
+ if( lang == NULL )
+ lang = strdup( b_empty_if_na ? "" : "-" );
+ INSERT_STRING( lang );
+ break;
+ }
case 'P':
if( p_input )
{
format_duration( buf, sizeof(buf), i_time );
}
else
- strcpy( buf, b_empty_if_na ? "" : "--:--:--" );
+ strcpy( buf, b_empty_if_na ? "" : "--:--:--" );
INSERT_STRING_NO_FREE( buf );
break;
case 'U':
}
break;
case 'V':
- {
- audio_volume_t volume;
- aout_VolumeGet( p_object, &volume );
- snprintf( buf, 10, "%d", volume );
- INSERT_STRING_NO_FREE( buf );
- break;
- }
+ {
+ audio_volume_t volume = aout_VolumeGet( p_object );
+ snprintf( buf, 10, "%d", volume );
+ INSERT_STRING_NO_FREE( buf );
+ break;
+ }
case '_':
*(dst+d) = '\n';
d++;
break;
+ case 'Z':
+ if( p_item )
+ {
+ char *psz_now_playing = input_item_GetNowPlaying( p_item );
+ if ( psz_now_playing == NULL )
+ {
+ char *psz_temp = input_item_GetTitleFbName( p_item );
+ char *psz_artist = input_item_GetArtist( p_item );
+ if( !EMPTY_STR( psz_temp ) )
+ {
+ INSERT_STRING( psz_temp );
+ if ( !EMPTY_STR( psz_artist ) )
+ INSERT_STRING_NO_FREE( " - " );
+ }
+ INSERT_STRING( psz_artist );
+ }
+ else
+ INSERT_STRING( psz_now_playing );
+ }
+ break;
case ' ':
b_empty_if_na = true;
*/
void filename_sanitize( char *str )
{
-#if defined( WIN32 )
+#if defined( WIN32 ) || defined( __OS2__ )
char *str_base = str;
#endif
return;
}
-#if defined( WIN32 )
+#if defined( WIN32 ) || defined( __OS2__ )
// Change leading spaces into underscores
while( *str && *str == ' ' )
*str++ = '_';
case '/':
#if defined( __APPLE__ )
case ':':
-#elif defined( WIN32 )
+#elif defined( WIN32 ) || defined( __OS2__ )
case '\\':
case '*':
case '"':
str++;
}
-#if defined( WIN32 )
+#if defined( WIN32 ) || defined( __OS2__ )
// Change trailing spaces into underscores
str--;
while( str != str_base )
*/
void path_sanitize( char *str )
{
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
/* check drive prefix if path is absolute */
if( (((unsigned char)(str[0] - 'A') < 26)
|| ((unsigned char)(str[0] - 'a') < 26)) && (':' == str[1]) )
#if defined( __APPLE__ )
if( *str == ':' )
*str = '_';
-#elif defined( WIN32 )
+#elif defined( WIN32 ) || defined( __OS2__ )
if( strchr( "*\"?:|<>", *str ) )
*str = '_';
if( *str == '/' )
}
#include <vlc_url.h>
+#ifdef WIN32
+# include <io.h>
+#endif
/**
- * Convert a file path to an URI.
- * If already an URI, return a copy of the string.
+ * Convert a file path to a URI.
+ * If already a URI, return a copy of the string.
* @param path path to convert (or URI to copy)
* @param scheme URI scheme to use (default is auto: "file", "fd" or "smb")
* @return a nul-terminated URI string (use free() to release it),
if (scheme == NULL && !strcmp (path, "-"))
return strdup ("fd://0"); // standard input
if (strstr (path, "://") != NULL)
- return strdup (path); /* Already an URI */
+ return strdup (path); /* Already a URI */
/* Note: VLC cannot handle URI schemes without double slash after the
* scheme name (such as mailto: or news:). */
char *buf;
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
/* Drive letter */
if (isalpha (path[0]) && (path[1] == ':'))
{
#endif
if (!strncmp (path, "\\\\", 2))
{ /* Windows UNC paths */
-#ifndef WIN32
+#if !defined( WIN32 ) && !defined( __OS2__ )
if (scheme != NULL)
return NULL; /* remote files not supported */
else
if (path[0] != DIR_SEP_CHAR)
{ /* Relative path: prepend the current working directory */
- char cwd[PATH_MAX];
+ char *cwd, *ret;
- if (getcwd (cwd, sizeof (cwd)) == NULL) /* FIXME: UTF8? */
- return NULL;
- if (asprintf (&buf, "%s/%s", cwd, path) == -1)
+ if ((cwd = vlc_getcwd ()) == NULL)
return NULL;
- char *ret = make_URI (buf, scheme);
+ if (asprintf (&buf, "%s"DIR_SEP"%s", cwd, path) == -1)
+ buf = NULL;
+
+ free (cwd);
+ ret = (buf != NULL) ? make_URI (buf, scheme) : NULL;
free (buf);
return ret;
}
}
/**
- * Tries to convert an URI to a local (UTF-8-encoded) file path.
+ * Tries to convert a URI to a local (UTF-8-encoded) file path.
* @param url URI to convert
* @return NULL on error, a nul-terminated string otherwise
* (use free() to release it)
#endif
/* Leading slash => local path */
if (*path == DIR_SEP_CHAR)
-#if !defined (WIN32) || defined (UNDER_CE)
+#if (!defined (WIN32) && !defined (__OS2__)) || defined (UNDER_CE)
return path;
#else
return memmove (path, path + 1, strlen (path + 1) + 1);
if (!strncasecmp (path, "localhost"DIR_SEP, 10))
return memmove (path, path + 9, strlen (path + 9) + 1);
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
if (*path && asprintf (&ret, "\\\\%s", path) == -1)
ret = NULL;
#endif
if (*end)
goto out;
-#ifndef WIN32
+#if !defined( WIN32 ) && !defined( __OS2__ )
switch (fd)
{
case 0:
projects / vlc / blobdiff