X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_url.h;h=3d26ba8dd7412e4edcdf465166cffbbfc665a2c8;hb=2209f2992dc3eda6a55a3f07e2f22f2caf772ac2;hp=e91c697f809ddc26b4292e84c598b3eeb1173fce;hpb=73508ddd4ce715e88b8fc26563cb879c32c01403;p=vlc

diff --git a/include/vlc_url.h b/include/vlc_url.h
index e91c697f80..3d26ba8dd7 100644
--- a/include/vlc_url.h
+++ b/include/vlc_url.h
@@ -22,10 +22,14 @@
  * 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;
@@ -38,7 +42,13 @@ 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 *, encode_URI_component, ( const char *psz ) );
 
 /*****************************************************************************
  * vlc_UrlParse:
@@ -53,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;
@@ -69,7 +80,23 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
     }
     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 */
@@ -82,7 +109,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;
@@ -94,8 +122,9 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
             /* 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;
     }
 
@@ -150,8 +179,6 @@ static inline void vlc_UrlParse( vlc_url_t *url, const char *psz_url,
 
 /*****************************************************************************
  * vlc_UrlClean:
- *****************************************************************************
- *
  *****************************************************************************/
 static inline void vlc_UrlClean( vlc_url_t *url )
 {
@@ -169,25 +196,17 @@ static inline void vlc_UrlClean( vlc_url_t *url )
     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, ( const char *psz ) );
 
 static inline char *vlc_UrlEncode( const char *psz_url )
 {
     /* FIXME: do not encode / : ? and & _when_ not needed */
-    return encode_URI( psz_url );
+    return encode_URI_component( psz_url );
 }
 
-/*****************************************************************************
- * vlc_UrlIsNotEncoded:
- *****************************************************************************
- * check if given string is not a valid URL and must hence be encoded
- *****************************************************************************/
 #include <ctype.h>
 
+/** Check whether a given string is not a valid URL and must hence be
+ *  encoded */
 static inline int vlc_UrlIsNotEncoded( const char *psz_url )
 {
     const char *ptr;
@@ -212,63 +231,5 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
     return 0; /* looks fine - but maybe it is not encoded */
 }
 
-/*****************************************************************************
- * vlc_b64_encode:
- *****************************************************************************
- *
- *****************************************************************************/
-static inline char *vlc_b64_encode( char *src )
-{
-    static const char b64[] =
-           "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    size_t len = strlen( src );
-
-    char *ret;
-    char *dst = (char *)malloc( ( len + 4 ) * 4 / 3 );
-    if( dst == NULL )
-        return NULL;
-
-    ret = dst;
-
-    while( len > 0 )
-    {
-        /* pops (up to) 3 bytes of input */
-        uint32_t v = *src++ << 24;
-
-        if( len >= 2 )
-        {
-            v |= *src++ << 16;
-            if( len >= 3 )
-                v |= *src++ << 8;
-        }
-
-        /* pushes (up to) 4 bytes of output */
-        while( v )
-        {
-            *dst++ = b64[v >> 26];
-            v = v << 6;
-        }
 
-        switch( len )
-        {
-            case 1:
-                *dst++ = '=';
-                *dst++ = '=';
-                len--;
-                break;
-
-            case 2:
-                *dst++ = '=';
-                len -= 2;
-                break;
-
-            default:
-                len -= 3;
-        }
-    }
-
-    *dst = '\0';
-
-    return ret;
-}
 #endif