X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsmb.c;h=3f21b6be03afa42b1d92498166db4d5680e2d52b;hb=7b0dd84fff6c300cab5e0bdbf2a29fb1b3618e62;hp=42a66082cd91b09b75667acbc41fbff753e2c265;hpb=dd28e3282651b344958855364646487edb3859f1;p=vlc diff --git a/modules/access/smb.c b/modules/access/smb.c index 42a66082cd..3f21b6be03 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 @@ -72,18 +77,18 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_shortname( "SMB" ); - set_description( _("SMB input") ); - set_capability( "access2", 0 ); + 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 ); + DOMAIN_LONGTEXT, false ); add_shortcut( "smb" ); set_callbacks( Open, Close ); vlc_module_end(); @@ -91,7 +96,7 @@ 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 @@ -187,7 +192,7 @@ static int Open( vlc_object_t *p_this ) if( psz_user && !*psz_user ) { free( psz_user ); psz_user = 0; } 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 = var_CreateGetString( p_access, "smb-domain" ); if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; } #ifdef WIN32 @@ -204,14 +209,13 @@ static int Open( vlc_object_t *p_this ) 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 ); #ifdef USE_CTX if( !(p_smb = smbc_new_context()) ) { - msg_Err( p_access, "out of memory" ); free( psz_uri ); return VLC_ENOMEM; } @@ -220,16 +224,16 @@ 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; } - if( !(p_file = p_smb->open( p_smb, psz_uri, O_RDONLY, 0 )) ) + 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 +243,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 +255,18 @@ static int Open( vlc_object_t *p_this ) } #endif +/* +** 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 +275,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 +330,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 +339,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 +352,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 +366,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,27 +381,27 @@ 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; + bool *pb_bool; int *pi_int; 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; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_GET_MTU: @@ -406,6 +422,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 +444,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 +484,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 );