/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
#ifdef WIN32
#ifdef HAVE_FCNTL_H
/*****************************************************************************
* 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 );
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 )
+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;
}
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
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()) )
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;
}
- p_access->info.i_size = 0;
+ /* Init p_access */
+ 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
#ifndef WIN32
}
#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;
}
- p_access->info.i_size = 0;
+ /* Init p_access */
+ 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
free( psz_uri );
- /* Init p_access */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_seek = Seek;
- p_access->pf_control = Control;
- p_access->info.i_update = 0;
- p_access->info.i_pos = 0;
- 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 ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
-
#ifdef USE_CTX
p_sys->p_smb = p_smb;
p_sys->p_file = p_file;
#endif
if( i_ret == -1 )
{
- msg_Err( p_access, "seek failed (%s)", strerror(errno) );
+ msg_Err( p_access, "seek failed (%m)" );
return VLC_EGENERIC;
}
/*****************************************************************************
* 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;
#endif
if( i_read < 0 )
{
- msg_Err( p_access, "read failed (%s)", strerror(errno) );
+ msg_Err( p_access, "read failed (%m)" );
return -1;
}
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
{
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 );