X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fsmb.c;h=96e400da8eb36dddba3abb8253d162568f99607c;hb=0bafd9ff09406c8ddb180502cac2a8688bdc621d;hp=72b85367e300842c5cf09d5040c3f6008f614d09;hpb=80dd59664eb78583ed98a9016d44a162da346321;p=vlc diff --git a/modules/access/smb.c b/modules/access/smb.c index 72b85367e3..96e400da8e 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -26,7 +26,12 @@ *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #ifdef WIN32 @@ -70,28 +75,28 @@ static void Close( vlc_object_t * ); #define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \ "will be used for the connection.") -vlc_module_begin(); - set_shortname( "SMB" ); - set_description( _("SMB input") ); - set_capability( "access2", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "SMB" ) + set_description( N_("SMB input") ) + set_capability( "access", 0 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, - VLC_FALSE ); + false ) add_string( "smb-pwd", NULL, NULL, PASS_TEXT, - PASS_LONGTEXT, VLC_FALSE ); + PASS_LONGTEXT, false ) add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT, - DOMAIN_LONGTEXT, VLC_FALSE ); - add_shortcut( "smb" ); - set_callbacks( Open, Close ); -vlc_module_end(); + DOMAIN_LONGTEXT, false ) + add_shortcut( "smb" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Read( access_t *, uint8_t *, int ); +static ssize_t Read( access_t *, uint8_t *, size_t ); static int Seek( access_t *, int64_t ); static int Control( access_t *, int, va_list ); @@ -107,13 +112,13 @@ struct access_sys_t #ifdef WIN32 static void Win32AddConnection( access_t *, char *, char *, char *, char * ); -#endif - -void smb_auth( const char *srv, const char *shr, char *wg, int wglen, - char *un, int unlen, char *pw, int pwlen ) +#else +static void smb_auth( const char *srv, const char *shr, char *wg, int wglen, + char *un, int unlen, char *pw, int pwlen ) { //wglen = unlen = pwlen = 0; } +#endif /**************************************************************************** * Open: connect to smb server and ask for file @@ -124,7 +129,7 @@ static int Open( vlc_object_t *p_this ) access_sys_t *p_sys; struct stat filestat; char *psz_path, *psz_uri; - char *psz_user = 0, *psz_pwd = 0, *psz_domain = 0; + char *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL; int i_ret; #ifdef USE_CTX @@ -184,34 +189,36 @@ static int Open( vlc_object_t *p_this ) * smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */ if( !psz_user ) psz_user = var_CreateGetString( p_access, "smb-user" ); - if( psz_user && !*psz_user ) { free( psz_user ); psz_user = 0; } + if( psz_user && !*psz_user ) { free( psz_user ); psz_user = NULL; } if( !psz_pwd ) psz_pwd = var_CreateGetString( p_access, "smb-pwd" ); - if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; } - if(!psz_domain) psz_domain = var_CreateGetString( p_access, "smb-domain" ); - if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; } + if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = NULL; } + if( !psz_domain ) psz_domain = var_CreateGetString( p_access, "smb-domain" ); + if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = NULL; } #ifdef WIN32 if( psz_user ) Win32AddConnection( p_access, psz_path, psz_user, psz_pwd, psz_domain); - asprintf( &psz_uri, "//%s", psz_path ); + i_ret = asprintf( &psz_uri, "//%s", psz_path ); #else if( psz_user ) - asprintf( &psz_uri, "smb://%s%s%s%s%s@%s", - psz_domain ? psz_domain : "", psz_domain ? ";" : "", - psz_user, psz_pwd ? ":" : "", - psz_pwd ? psz_pwd : "", psz_path ); + i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s", + psz_domain ? psz_domain : "", psz_domain ? ";" : "", + psz_user, psz_pwd ? ":" : "", + psz_pwd ? psz_pwd : "", psz_path ); else - asprintf( &psz_uri, "smb://%s", psz_path ); + i_ret = asprintf( &psz_uri, "smb://%s", psz_path ); #endif - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); - if( psz_domain ) free( psz_domain ); + free( psz_user ); + free( psz_pwd ); + free( psz_domain ); + + if( i_ret == -1 ) + return VLC_ENOMEM; #ifdef USE_CTX if( !(p_smb = smbc_new_context()) ) { - msg_Err( p_access, "out of memory" ); free( psz_uri ); return VLC_ENOMEM; } @@ -220,7 +227,7 @@ static int Open( vlc_object_t *p_this ) if( !smbc_init_context( p_smb ) ) { - msg_Err( p_access, "cannot initialize context (%s)", strerror(errno) ); + msg_Err( p_access, "cannot initialize context (%m)" ); smbc_free_context( p_smb, 1 ); free( psz_uri ); return VLC_EGENERIC; @@ -228,8 +235,8 @@ static int Open( vlc_object_t *p_this ) if( !(p_file = (p_smb->open)( p_smb, psz_uri, O_RDONLY, 0 )) ) { - msg_Err( p_access, "open failed for '%s' (%s)", - p_access->psz_path, strerror(errno) ); + msg_Err( p_access, "open failed for '%s' (%m)", + p_access->psz_path ); smbc_free_context( p_smb, 1 ); free( psz_uri ); return VLC_EGENERIC; @@ -239,7 +246,7 @@ static int Open( vlc_object_t *p_this ) STANDARD_READ_ACCESS_INIT; i_ret = p_smb->fstat( p_smb, p_file, &filestat ); - if( i_ret ) msg_Err( p_access, "stat failed (%s)", strerror(errno) ); + if( i_ret ) msg_Err( p_access, "stat failed (%m)" ); else p_access->info.i_size = filestat.st_size; #else @@ -251,10 +258,18 @@ static int Open( vlc_object_t *p_this ) } #endif - if( (i_smb = (smbc_open)( psz_uri, O_RDONLY, 0 )) < 0 ) +/* +** some version of glibc defines open as a macro, causing havoc +** with other macros using 'open' under the hood, such as the +** following one: +*/ +#if defined(smbc_open) && defined(open) +# undef open +#endif + if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 ) { - msg_Err( p_access, "open failed for '%s' (%s)", - p_access->psz_path, strerror(errno) ); + msg_Err( p_access, "open failed for '%s' (%m)", + p_access->psz_path ); free( psz_uri ); return VLC_EGENERIC; } @@ -263,7 +278,11 @@ static int Open( vlc_object_t *p_this ) STANDARD_READ_ACCESS_INIT; i_ret = smbc_fstat( i_smb, &filestat ); - if( i_ret ) msg_Err( p_access, "stat failed (%s)", strerror(i_ret) ); + if( i_ret ) + { + errno = i_ret; + msg_Err( p_access, "stat failed (%m)" ); + } else p_access->info.i_size = filestat.st_size; #endif @@ -314,7 +333,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) if( i_pos < 0 ) return VLC_EGENERIC; - msg_Dbg( p_access, "seeking to "I64Fd, i_pos ); + msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); #ifdef USE_CTX i_ret = p_sys->p_smb->lseek(p_sys->p_smb, p_sys->p_file, i_pos, SEEK_SET); @@ -323,11 +342,11 @@ static int Seek( access_t *p_access, int64_t i_pos ) #endif if( i_ret == -1 ) { - msg_Err( p_access, "seek failed (%s)", strerror(errno) ); + msg_Err( p_access, "seek failed (%m)" ); return VLC_EGENERIC; } - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; p_access->info.i_pos = i_ret; return VLC_SUCCESS; @@ -336,7 +355,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) /***************************************************************************** * Read: *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; int i_read; @@ -350,11 +369,11 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) #endif if( i_read < 0 ) { - msg_Err( p_access, "read failed (%s)", strerror(errno) ); + msg_Err( p_access, "read failed (%m)" ); return -1; } - if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE; + if( i_read == 0 ) p_access->info.b_eof = true; else if( i_read > 0 ) p_access->info.i_pos += i_read; return i_read; @@ -365,32 +384,26 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; - int *pi_int; - int64_t *pi_64; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { case ACCESS_CAN_SEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; - break; - - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_GET_PTS_DELAY: @@ -406,6 +419,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -427,6 +441,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, NETRESOURCE net_resource; DWORD i_result; char *psz_parser; + VLC_UNUSED( psz_domain ); HINSTANCE hdll = LoadLibrary(_T("MPR.DLL")); if( !hdll ) @@ -466,7 +481,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, { msg_Dbg( p_access, "connected to %s", psz_remote ); } - else if( i_result != ERROR_ALREADY_ASSIGNED && + else if( i_result != ERROR_ALREADY_ASSIGNED && i_result != ERROR_DEVICE_ALREADY_REMEMBERED ) { msg_Dbg( p_access, "already connected to %s", psz_remote );