/*****************************************************************************
* vlc_url.h: URL related macros
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* RĂ©mi Denis-Courmont <rem # videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef VLC_URL_H
# define VLC_URL_H
+/**
+ * \file
+ * This file defines functions for manipulating URL in vlc
+ */
+
struct vlc_url_t
{
char *psz_protocol;
char *psz_buffer; /* to be freed */
};
-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_API char * decode_URI_duplicate( const char *psz );
+VLC_API char * decode_URI( char *psz );
+VLC_API char * encode_URI_component( const char *psz );
+VLC_API char * make_URI( const char *path, const char *scheme );
+VLC_API char * make_path( const char *url );
/*****************************************************************************
* vlc_UrlParse:
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) )
p = strchr( psz_parse, '/' );
if( !p || psz_parse < p )
{
- char *p2;
-
/* We have a host[:port] */
url->psz_host = strdup( psz_parse );
if( p )
url->psz_buffer = NULL;
}
-
-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
for( ptr = psz_url; *ptr; ptr++ )
{
- char c = *ptr;
+ unsigned char c = *ptr;
if( c == '%' )
{
- if( !isxdigit( ptr[1] ) || !isxdigit( ptr[2] ) )
+ if( !isxdigit( (unsigned char)ptr[1] )
+ || !isxdigit( (unsigned char)ptr[2] ) )
return 1; /* not encoded */
ptr += 2;
}
return 0; /* looks fine - but maybe it is not encoded */
}
-
#endif