X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_url.h;h=e5b29eba2364921cd6491800d40fea7115431a46;hb=4893ae68dd1888c379bdb5e11d9d28b75873b366;hp=971cf34aad48f986bd46b37e58f1f6e4db6d1584;hpb=5f018616efa69287d92c9452132c3f5aeb699e6f;p=vlc

diff --git a/include/vlc_url.h b/include/vlc_url.h
index 971cf34aad..e5b29eba23 100644
--- a/include/vlc_url.h
+++ b/include/vlc_url.h
@@ -22,14 +22,15 @@
  * 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;
@@ -42,13 +43,12 @@ typedef struct
     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 *, decode_URI, ( char *psz ) );
 VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) );
+VLC_EXPORT( char *, make_URI, ( const char *path ) );
 
 /*****************************************************************************
  * vlc_UrlParse:
@@ -63,6 +63,7 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
     char *psz_dup;
     char *psz_parse;
     char *p;
+    char *p2;
 
     url->psz_protocol = NULL;
     url->psz_username = NULL;
@@ -83,7 +84,6 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
     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) )
@@ -108,7 +108,8 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
         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;
@@ -129,8 +130,6 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
     p = strchr( psz_parse, '/' );
     if( !p || psz_parse < p )
     {
-        char *p2;
-
         /* We have a host[:port] */
         url->psz_host = strdup( psz_parse );
         if( p )
@@ -180,8 +179,8 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
  *****************************************************************************/
 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;
@@ -194,7 +193,6 @@ static inline void vlc_UrlClean( vlc_url_t *url )
     url->psz_buffer   = NULL;
 }
 
-
 static inline char *vlc_UrlEncode( const char *psz_url )
 {
     /* FIXME: do not encode / : ? and & _when_ not needed */
@@ -229,5 +227,4 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
     return 0; /* looks fine - but maybe it is not encoded */
 }
 
-
 #endif