X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fftp.c;h=07cbf9b2a8ebf8902e51b4548314995c33d9b592;hb=82c27c5b2ca564a1e1f67d870c557ca878807221;hp=b2d692d19229577fb6af848efefdecb2a6024d6b;hpb=e4a867371a688d8fc4bcfc45c9d61d4386100b05;p=vlc diff --git a/modules/access/ftp.c b/modules/access/ftp.c index b2d692d192..07cbf9b2a8 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -41,6 +41,7 @@ #include #include #include +#include #ifndef IPPORT_FTP # define IPPORT_FTP 21u @@ -79,8 +80,8 @@ vlc_module_begin () change_safe() add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT, false ) - add_password( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT, - PASS_LONGTEXT, false ) + add_string( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT, + PASS_LONGTEXT, false ) add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT, ACCOUNT_LONGTEXT, false ) add_shortcut( "ftp" ) @@ -101,7 +102,7 @@ vlc_module_end () *****************************************************************************/ static ssize_t Read( access_t *, uint8_t *, size_t ); static ssize_t Write( sout_access_out_t *, block_t * ); -static int Seek( access_t *, int64_t ); +static int Seek( access_t *, uint64_t ); static int OutSeek( sout_access_out_t *, off_t ); static int Control( access_t *, int, va_list ); @@ -121,7 +122,7 @@ struct access_sys_t static int ftp_SendCommand( vlc_object_t *, access_sys_t *, const char *, ... ); static int ftp_ReadCommand( vlc_object_t *, access_sys_t *, int *, char ** ); -static int ftp_StartStream( vlc_object_t *, access_sys_t *, int64_t ); +static int ftp_StartStream( vlc_object_t *, access_sys_t *, uint64_t ); static int ftp_StopStream ( vlc_object_t *, access_sys_t * ); static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) @@ -302,12 +303,27 @@ static int parseURL( vlc_url_t *url, const char *path ) if( url->i_port <= 0 ) url->i_port = IPPORT_FTP; /* default port */ - /* FTP URLs are relative to user's default directory (RFC1738) + if( url->psz_path == NULL ) + return VLC_SUCCESS; + /* FTP URLs are relative to user's default directory (RFC1738 §3.2) For absolute path use ftp://foo.bar//usr/local/etc/filename */ - - if( url->psz_path && *url->psz_path == '/' ) + /* FIXME: we should issue a series of CWD, one per slash */ + if( url->psz_path ) + { + assert( url->psz_path[0] == '/' ); url->psz_path++; + } + char *type = strstr( url->psz_path, ";type=" ); + if( type ) + { + *type = '\0'; + if( strchr( "iI", type[6] ) == NULL ) + return VLC_EGENERIC; /* ASCII and directory not supported */ + } + decode_URI( url->psz_path ); + /* FIXME: check for UTF-8 support, otherwise only ASCII is allowed */ + EnsureUTF8( url->psz_path ); return VLC_SUCCESS; } @@ -327,35 +343,36 @@ static int InOpen( vlc_object_t *p_this ) p_sys->out = false; p_sys->directory = false; - if( parseURL( &p_sys->url, p_access->psz_path ) ) + if( parseURL( &p_sys->url, p_access->psz_location ) ) goto exit_error; if( Connect( p_this, p_sys ) ) goto exit_error; /* get size */ - if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path - ? p_sys->url.psz_path : "" ) < 0 - || ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 ) - { - msg_Dbg( p_access, "cannot get file size" ); - msg_Dbg( p_access, "will try to get directory contents" ); - if( ftp_SendCommand( p_this, p_sys, "CWD %s", p_sys->url.psz_path - ? p_sys->url.psz_path : "" ) < 0 || - ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 ) - { - msg_Err( p_access, "file or directory doesn't exist" ); - net_Close( p_sys->fd_cmd ); - goto exit_error; - } + if( p_sys->url.psz_path == NULL ) p_sys->directory = true; - } else + if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path ) < 0 ) + goto error; + else + if ( ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) == 2 ) { p_access->info.i_size = atoll( &psz_arg[4] ); free( psz_arg ); - msg_Dbg( p_access, "file size: %"PRId64, p_access->info.i_size ); + msg_Dbg( p_access, "file size: %"PRIu64, p_access->info.i_size ); } + else + if( ftp_SendCommand( p_this, p_sys, "CWD %s", p_sys->url.psz_path ) < 0 ) + goto error; + else + if( ftp_ReadCommand( p_this, p_sys, NULL, NULL ) != 2 ) + { + msg_Err( p_access, "file or directory does not exist" ); + goto error; + } + else + p_sys->directory = true; /* Start the 'stream' */ if( ftp_StartStream( p_this, p_sys, 0 ) < 0 ) @@ -370,6 +387,8 @@ static int InOpen( vlc_object_t *p_this ) return VLC_SUCCESS; +error: + net_Close( p_sys->fd_cmd ); exit_error: vlc_UrlClean( &p_sys->url ); free( p_sys ); @@ -391,6 +410,11 @@ static int OutOpen( vlc_object_t *p_this ) if( parseURL( &p_sys->url, p_access->psz_path ) ) goto exit_error; + if( p_sys->url.psz_path == NULL ) + { + msg_Err( p_this, "no filename specified" ); + goto exit_error; + } if( Connect( p_this, p_sys ) ) goto exit_error; @@ -452,12 +476,9 @@ static void OutClose( vlc_object_t *p_this ) /***************************************************************************** * Seek: try to go at the right place *****************************************************************************/ -static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, int64_t i_pos ) +static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, uint64_t i_pos ) { - if( i_pos < 0 ) - return VLC_EGENERIC; - - msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); + msg_Dbg( p_access, "seeking to %"PRIu64, i_pos ); ftp_StopStream( (vlc_object_t *)p_access, p_sys ); if( ftp_StartStream( (vlc_object_t *)p_access, p_sys, i_pos ) < 0 ) @@ -466,7 +487,7 @@ static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, int64_t i_pos ) return VLC_SUCCESS; } -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { int val = _Seek( (vlc_object_t *)p_access, p_access->p_sys, i_pos ); if( val ) @@ -563,7 +584,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_CAN_SEEK: pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; + *pb_bool = !p_access->p_sys->directory; break; case ACCESS_CAN_FASTSEEK: pb_bool = (bool*)va_arg( args, bool* ); @@ -581,7 +602,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000); + *pi_64 = var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000); break; /* */ @@ -624,8 +645,7 @@ static int ftp_SendCommand( vlc_object_t *p_access, access_sys_t *p_sys, msg_Dbg( p_access, "ftp_SendCommand:\"%s\"", psz_cmd); - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd_cmd, NULL, "%s\r\n", - psz_cmd ) < 0 ) + if( net_Printf( p_access, p_sys->fd_cmd, NULL, "%s\r\n", psz_cmd ) < 0 ) { msg_Err( p_access, "failed to send command" ); return VLC_EGENERIC; @@ -703,7 +723,7 @@ static int ftp_ReadCommand( vlc_object_t *p_access, access_sys_t *p_sys, } static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, - int64_t i_start ) + uint64_t i_start ) { char psz_ipv4[16], *psz_ip = p_sys->sz_epsv_ip; int i_answer; @@ -799,9 +819,10 @@ static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, else { /* "1xx" message */ + assert( p_sys->url.psz_path ); if( ftp_SendCommand( p_access, p_sys, "%s %s", p_sys->out ? "STOR" : "RETR", - p_sys->url.psz_path ? p_sys->url.psz_path : "" ) < 0 + p_sys->url.psz_path ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 2 ) { msg_Err( p_access, "cannot retrieve file" );