X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fgnomevfs.c;h=86c4feb6760bed7854a2f6e5b84317dfb725eef7;hb=404777401c24c5836eb68ad20c8fd58457a4c586;hp=9ce36a9dbb63933a78fe838619bf3c1f98323016;hpb=af355abd513b69d2cad08c02857001fd218cfc09;p=vlc diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index 9ce36a9dbb..86c4feb676 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -33,6 +33,7 @@ #include #include "charset.h" +#include "network.h" /***************************************************************************** * Module descriptor @@ -47,7 +48,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_description( _("GnomeVFS filesystem file input") ); - set_shortname( _("GnomeVFS") ); + set_shortname( "GnomeVFS" ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); @@ -82,22 +83,26 @@ struct access_sys_t *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - access_t *p_access = (access_t*)p_this; - access_sys_t *p_sys; - char *psz_name; - char *psz, *psz_uri; - GnomeVFSURI *p_uri; - GnomeVFSResult i_ret; - + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys = NULL; + char *psz_name = NULL; + char *psz = NULL; + char *psz_uri = NULL; + char *psz_unescaped = NULL; + char *psz_expand_tilde = NULL; + GnomeVFSURI *p_uri = NULL; + GnomeVFSResult i_ret; + GnomeVFSHandle *p_handle = NULL; if( !(gnome_vfs_init()) ) { msg_Warn( p_access, "couldn't initilize GnomeVFS" ); return VLC_EGENERIC; } + /* FIXME Since GnomeVFS segfaults on exit if we initialize it without trying to - open a file with a valid protocol, try top open at least file:// */ - gnome_vfs_open( &(p_sys->p_handle), "file://", 5 ); + open a file with a valid protocol, try to open at least file:// */ + gnome_vfs_open( &p_handle, "file://", 5 ); p_access->pf_read = Read; p_access->pf_block = NULL; @@ -109,54 +114,91 @@ static int Open( vlc_object_t *p_this ) p_access->info.b_eof = VLC_FALSE; p_access->info.i_title = 0; p_access->info.i_seekpoint = 0; + p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; + + p_sys->p_handle = p_handle; p_sys->i_nb_reads = 0; p_sys->b_pace_control = VLC_TRUE; - if( strcmp( "gnomevfs", p_access->psz_access ) && *(p_access->psz_access) != '\0') { psz_name = malloc( strlen( p_access->psz_access ) + - strlen( p_access->psz_path ) + 3 ); - strcpy( psz_name, p_access->psz_access ); - strcat( psz_name, "://" ); - strcat( psz_name, p_access->psz_path ); + strlen( p_access->psz_path ) + 4 ); + sprintf( psz_name, "%s://%s", p_access->psz_access, + p_access->psz_path ); } else { psz_name = strdup( p_access->psz_path ); } - psz = ToLocale( psz_name ); + psz_expand_tilde = gnome_vfs_expand_initial_tilde( psz ); + LocaleFree( psz ); + + psz_unescaped = gnome_vfs_make_uri_from_shell_arg( psz_expand_tilde ); - /* Use gnome_vfs_make_uri_from_input_with_dirs for local paths, as it deals - relative directories, and gnome_vfs_make_uri_from_input_with_dirs - otherwise */ - psz_uri = gnome_vfs_make_uri_from_input_with_dirs( psz, - GNOME_VFS_MAKE_URI_DIR_CURRENT); - if( *psz_uri != '/' ) + /* gnome_vfs_make_uri_from_shell_arg will only escape the uri + for relative paths. So we need to use + gnome_vfs_escape_host_and_path_string in other cases. */ + + if( !strcmp( psz_unescaped, psz_expand_tilde ) ) { - g_free( psz_uri ); - psz_uri = gnome_vfs_escape_host_and_path_string( psz ); + /* Now we are sure that we have a complete valid unescaped URI beginning + with the protocol. We want to escape it. However, gnomevfs's escaping + function are broken and will try to escape characters un the username/ + password field. So parse the URI with vlc_UrlParse ans only escape the + path */ + + vlc_url_t url; + char *psz_escaped_path; + char *psz_path_begin; + + vlc_UrlParse( &url, psz_unescaped, 0 ); + psz_escaped_path = gnome_vfs_escape_path_string( url.psz_path ); + + if( psz_escaped_path ) + { + /* Now let's reconstruct a valid URI from all that stuff */ + psz_path_begin = psz_unescaped + strlen( psz_unescaped ) + - strlen( url.psz_path ); + *psz_path_begin = '\0'; + psz_uri = malloc( strlen( psz_unescaped ) + + strlen( psz_escaped_path ) + 1 ); + sprintf( psz_uri, "%s%s",psz_unescaped, psz_escaped_path ); + + g_free( psz_escaped_path ); + g_free( psz_unescaped ); + } + else + { + psz_uri = psz_unescaped; + } + } + else + { + psz_uri = psz_unescaped; } + g_free( psz_expand_tilde ); p_uri = gnome_vfs_uri_new( psz_uri ); - if( p_uri ) { p_sys->p_file_info = gnome_vfs_file_info_new(); i_ret = gnome_vfs_get_file_info_uri( p_uri, - p_sys->p_file_info, 8 ); + p_sys->p_file_info, 8 ); if( i_ret ) { - msg_Err( p_access, "cannot get file info (%s)", - gnome_vfs_result_to_string( i_ret ) ); + msg_Warn( p_access, "cannot get file info for uri %s (%s)", + psz_uri, gnome_vfs_result_to_string( i_ret ) ); gnome_vfs_file_info_unref( p_sys->p_file_info ); gnome_vfs_uri_unref( p_uri); free( p_sys ); - free( psz_uri ); + g_free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } @@ -164,13 +206,11 @@ static int Open( vlc_object_t *p_this ) else { msg_Warn( p_access, "cannot parse MRL %s or unsupported protocol", psz_name ); - LocaleFree( psz ); g_free( psz_uri ); free( p_sys ); free( psz_name ); return VLC_EGENERIC; } - LocaleFree( psz ); msg_Dbg( p_access, "opening file `%s'", psz_uri ); i_ret = gnome_vfs_open( &(p_sys->p_handle), psz_uri, 5 ); @@ -179,11 +219,9 @@ static int Open( vlc_object_t *p_this ) msg_Warn( p_access, "cannot open file %s: %s", psz_uri, gnome_vfs_result_to_string( i_ret ) ); - LocaleFree( psz ); - g_free( psz_uri ); gnome_vfs_uri_unref( p_uri); - free( p_sys ); - free( psz_uri ); + g_free( psz_uri ); + free( p_sys ); free( psz_name ); return VLC_EGENERIC; } @@ -193,7 +231,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_local = VLC_TRUE; } - if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_REGULAR || + if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_REGULAR || p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE || p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE ) { @@ -214,10 +252,11 @@ static int Open( vlc_object_t *p_this ) if( p_sys->b_seekable && !p_access->info.i_size ) { /* FIXME that's bad because all others access will be probed */ - msg_Err( p_access, "file %s is empty, aborting", psz_name ); + msg_Warn( p_access, "file %s is empty, aborting", psz_name ); gnome_vfs_file_info_unref( p_sys->p_file_info ); + gnome_vfs_uri_unref( p_uri); free( p_sys ); - free( psz_uri ); + g_free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } @@ -230,7 +269,6 @@ static int Open( vlc_object_t *p_this ) p_sys->psz_name = psz_name; gnome_vfs_uri_unref( p_uri); return VLC_SUCCESS; - } /***************************************************************************** @@ -261,12 +299,11 @@ static void Close( vlc_object_t * p_this ) static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) { access_sys_t *p_sys = p_access->p_sys; - int i_ret; GnomeVFSFileSize i_read_len; + int i_ret; i_ret = gnome_vfs_read( p_sys->p_handle, p_buffer, (GnomeVFSFileSize)i_len, &i_read_len ); - if( i_ret ) { p_access->info.b_eof = VLC_TRUE; @@ -319,7 +356,6 @@ static int Seek( access_t *p_access, int64_t i_pos ) i_ret = gnome_vfs_seek( p_sys->p_handle, GNOME_VFS_SEEK_START, (GnomeVFSFileOffset)i_pos); - if ( !i_ret ) { p_access->info.i_pos = i_pos; @@ -400,4 +436,3 @@ static int Control( access_t *p_access, int i_query, va_list args ) } return VLC_SUCCESS; } -