/*****************************************************************************
* vlc_url.h: URL related macros
*****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef __VLC_URL_H
-# define __VLC_URL_H
+#ifndef VLC_URL_H
+# define VLC_URL_H
-typedef struct
+/**
+ * \file
+ * This file defines functions for manipulating URL in vlc
+ */
+
+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;
}
url->psz_buffer = psz_parse = psz_dup = strdup( psz_url );
+ /* Search a valid protocol */
p = strstr( psz_parse, ":/" );
+ if( p != NULL )
+ {
+ 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;
}
p = strchr( psz_parse, '/' );
if( !p || psz_parse < p )
{
- char *p2;
-
/* We have a host[:port] */
url->psz_host = strdup( psz_parse );
if( p )
/*****************************************************************************
* vlc_UrlClean:
- *****************************************************************************
- *
*****************************************************************************/
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;
}
-static inline int isurlsafe( int c )
-{
- return ( (unsigned char)( c - 'a' ) < 26 )
- || ( (unsigned char)( c - 'A' ) < 26 )
- || ( (unsigned char)( c - '0' ) < 10 )
- /* Hmm, we should not encode character that are allowed in URLs
- * (even if they are not URL-safe), nor URL-safe characters.
- * We still encode some of them because of Microsoft's crap browser.
- */
- || ( strchr( "-_.", c ) != NULL );
-}
-
-/*****************************************************************************
- * vlc_UrlEncode:
- *****************************************************************************
- * perform URL encoding
- * (you do NOT want to do URL decoding - it is not reversible - do NOT do it)
- *****************************************************************************/
-static inline char *vlc_UrlEncode( const char *psz_url )
-{
- char *psz_enc, *out;
- const unsigned char *in;
-
- psz_enc = (char *)malloc( 3 * strlen( psz_url ) + 1 );
- if( psz_enc == NULL )
- return NULL;
-
- out = psz_enc;
- for( in = (const unsigned char *)psz_url; *in; in++ )
- {
- unsigned char c = *in;
-
- if( isurlsafe( c ) )
- *out++ = (char)c;
- else
- {
- *out++ = '%';
- *out++ = ( ( c >> 4 ) >= 0xA ) ? 'A' + ( c >> 4 ) - 0xA
- : '0' + ( c >> 4 );
- *out++ = ( ( c & 0xf ) >= 0xA ) ? 'A' + ( c & 0xf ) - 0xA
- : '0' + ( c & 0xf );
- }
- }
- *out++ = '\0';
-
- return (char *)realloc( psz_enc, out - psz_enc );
-}
-
-/*****************************************************************************
- * 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;
ptr += 2;
}
else
- if( !isurlsafe( c ) )
+ if( ( (unsigned char)( c - 'a' ) < 26 )
+ || ( (unsigned char)( c - 'A' ) < 26 )
+ || ( (unsigned char)( c - '0' ) < 10 )
+ || ( strchr( "-_.", c ) != NULL ) )
return 1;
}
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
projects / vlc / blobdiff