* 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
-#ifndef __VLC_URL_H
-# define __VLC_URL_H
+/**
+ * \file
+ * This file defines functions for manipulating URL in vlc
+ */
-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 *, decode_URI_duplicate, ( const char *psz ) );
+VLC_EXPORT( char *, decode_URI, ( char *psz ) );
+VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) );
+VLC_EXPORT( char *, make_URI, ( const char *path, const char *scheme ) );
+VLC_EXPORT( char *, make_path, ( const char *url ) );
/*****************************************************************************
* vlc_UrlParse:
char *psz_dup;
char *psz_parse;
char *p;
+ char *p2;
url->psz_protocol = NULL;
url->psz_username = NULL;
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) )
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;
}
p = strchr( psz_parse, '/' );
if( !p || psz_parse < p )
{
- char *p2;
-
/* We have a host[:port] */
url->psz_host = strdup( psz_parse );
if( 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 )
-{
- /* FIXME: do not encode / : ? and & _when_ not needed */
- return encode_URI_component( psz_url );
-}
-
#include <ctype.h>
/** Check whether a given string is not a valid URL and must hence be
return 0; /* looks fine - but maybe it is not encoded */
}
-
#endif