* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#if !defined( __LIBVLC__ )
- #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
#ifndef __VLC_URL_H
# define __VLC_URL_H
-typedef struct
+struct vlc_url_t
{
char *psz_protocol;
char *psz_username;
char *psz_option;
char *psz_buffer; /* to be freed */
-} vlc_url_t;
+};
+
+VLC_EXPORT( char *, unescape_URI_duplicate, ( const char *psz ) );
+VLC_EXPORT( void, unescape_URI, ( char *psz ) );
+VLC_EXPORT( char *, decode_URI_duplicate, ( const char *psz ) );
+VLC_EXPORT( void, decode_URI, ( char *psz ) );
+VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) );
/*****************************************************************************
* vlc_UrlParse:
char *psz_dup;
char *psz_parse;
char *p;
+ char *p2;
url->psz_protocol = NULL;
url->psz_username = NULL;
}
url->psz_buffer = psz_parse = psz_dup = strdup( psz_url );
+ /* Search a valid protocol */
p = strstr( psz_parse, ":/" );
+ if( p != NULL )
+ {
+ char *p2;
+ for( p2 = psz_parse; p2 < p; p2++ )
+ {
+#define I(i,a,b) ( (a) <= (i) && (i) <= (b) )
+ if( !I(*p2, 'a', 'z' ) && !I(*p2, 'A', 'Z') && !I(*p2, '0', '9') && *p2 != '+' && *p2 != '-' && *p2 != '.' )
+ {
+ p = NULL;
+ break;
+ }
+#undef I
+ }
+ }
+
if( p != NULL )
{
/* we have a protocol */
psz_parse = p;
}
p = strchr( psz_parse, '@' );
- if( p != NULL )
+ p2 = strchr( psz_parse, '/' );
+ if( p != NULL && ( p2 != NULL ? p < p2 : 1 ) )
{
/* We have a login */
url->psz_username = psz_parse;
/* We have a password */
*psz_parse++ = '\0';
url->psz_password = psz_parse;
+ decode_URI( url->psz_password );
}
-
+ decode_URI( url->psz_username );
psz_parse = p;
}
*****************************************************************************/
static inline void vlc_UrlClean( vlc_url_t *url )
{
- if( url->psz_buffer ) free( url->psz_buffer );
- if( url->psz_host ) free( url->psz_host );
+ free( url->psz_buffer );
+ free( url->psz_host );
url->psz_protocol = NULL;
url->psz_username = NULL;
url->psz_buffer = NULL;
}
-VLC_EXPORT( char *, unescape_URI_duplicate, ( const char *psz ) );
-VLC_EXPORT( void, unescape_URI, ( char *psz ) );
-VLC_EXPORT( char *, decode_URI_duplicate, ( const char *psz ) );
-VLC_EXPORT( void, decode_URI, ( char *psz ) );
-VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) );
static inline char *vlc_UrlEncode( const char *psz_url )
{