#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 ) );
char *psz_dup;
char *psz_parse;
char *p;
+ char *p2;
url->psz_protocol = NULL;
url->psz_username = NULL;
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;
*****************************************************************************/
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;