/*****************************************************************************
* smb.c: SMB input module
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2004 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
#ifdef WIN32
#ifdef HAVE_FCNTL_H
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for SMB streams. This " \
- "value should be set in millisecond units." )
+ "Caching value for SMB streams. This " \
+ "value should be set in milliseconds." )
#define USER_TEXT N_("SMB user name")
-#define USER_LONGTEXT N_("Allows you to modify the user name that will " \
+#define USER_LONGTEXT N_("User name that will " \
"be used for the connection.")
#define PASS_TEXT N_("SMB password")
-#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \
+#define PASS_LONGTEXT N_("Password that will be " \
"used for the connection.")
#define DOMAIN_TEXT N_("SMB domain")
-#define DOMAIN_LONGTEXT N_("Allows you to modify the domain/workgroup that " \
+#define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \
"will be used for the connection.")
vlc_module_begin();
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;
}
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) );
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) );
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)",
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) );
else p_access->info.i_size = filestat.st_size;
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;
access_sys_t *p_sys = p_access->p_sys;
#ifdef USE_CTX
+# ifndef HAVE__SMBCCTX_CLOSE_FN
p_sys->p_smb->close( p_sys->p_smb, p_sys->p_file );
+# else
+ p_sys->p_smb->close_fn( p_sys->p_smb, p_sys->p_file );
+# endif
smbc_free_context( p_sys->p_smb, 1 );
#else
smbc_close( p_sys->i_smb );
net_resource.dwType = RESOURCETYPE_DISK;
/* Find out server and share names */
- psz_server[0] = psz_share[0] = 0;
+ strlcpy( psz_server, psz_path, sizeof( psz_server ) );
+ psz_share[0] = 0;
psz_parser = strchr( psz_path, '/' );
if( psz_parser )
{
- char *psz_parser2;
- strncat( psz_server, psz_path, psz_parser - psz_path );
- psz_parser2 = strchr( psz_parser+1, '/' );
+ char *psz_parser2 = strchr( ++psz_parser, '/' );
if( psz_parser2 )
- strncat( psz_share, psz_parser+1, psz_parser2 - psz_parser -1 );
- }
- else strncat( psz_server, psz_path, MAX_PATH );
+ strlcpy( psz_share, psz_parser, sizeof( psz_share ) );
+ }
sprintf( psz_remote, "\\\\%s\\%s", psz_server, psz_share );
net_resource.lpRemoteName = psz_remote;
{
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 );