X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsmb.c;h=4d06b0b3dc1fdb6046c5e7ce645563bf5f3f0c86;hb=65022ed2467ecb2d0890df5a5af629eb50dd10f4;hp=0571fceefbcbefe6fa5907c47be1c92290c3dcb9;hpb=c766d434b0e2f7d8787a30703c06e27e9b2bb8d7;p=vlc

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 0571fceefb..4d06b0b3dc 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 
@@ -41,7 +41,7 @@
 #       include <sys/stat.h>
 #   endif
 #   include <io.h>
-#   define smbc_open(a,b,c) utf8_open(a,b,c)
+#   define smbc_open(a,b,c) vlc_open(a,b,c)
 #   define smbc_fstat(a,b) _fstati64(a,b)
 #   define smbc_read read
 #   define smbc_lseek _lseeki64
@@ -97,7 +97,7 @@ vlc_module_end ()
  * Local prototypes
  *****************************************************************************/
 static ssize_t Read( access_t *, uint8_t *, size_t );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
 static int Control( access_t *, int, va_list );
 
 struct access_sys_t
@@ -131,32 +131,32 @@ static int Open( vlc_object_t *p_this )
     access_t     *p_access = (access_t*)p_this;
     access_sys_t *p_sys;
     struct stat  filestat;
-    char         *psz_path, *psz_uri;
+    char         *psz_location, *psz_uri;
     char         *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL;
     int          i_ret;
     int          i_smb;
 
     /* Parse input URI
      * [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
-    psz_path = strchr( p_access->psz_path, '/' );
-    if( !psz_path )
+    psz_location = strchr( p_access->psz_location, '/' );
+    if( !psz_location )
     {
-        msg_Err( p_access, "invalid SMB URI: smb://%s", psz_path );
+        msg_Err( p_access, "invalid SMB URI: smb://%s", psz_location );
         return VLC_EGENERIC;
     }
     else
     {
-        char *psz_tmp = strdup( p_access->psz_path );
+        char *psz_tmp = strdup( p_access->psz_location );
         char *psz_parser;
 
-        psz_tmp[ psz_path - p_access->psz_path ] = 0;
-        psz_path = p_access->psz_path;
+        psz_tmp[ psz_location - p_access->psz_location ] = 0;
+        psz_location = p_access->psz_location;
         psz_parser = strchr( psz_tmp, '@' );
         if( psz_parser )
         {
             /* User info is there */
             *psz_parser = 0;
-            psz_path = p_access->psz_path + (psz_parser - psz_tmp) + 1;
+            psz_location = p_access->psz_location + (psz_parser - psz_tmp) + 1;
 
             psz_parser = strchr( psz_tmp, ':' );
             if( psz_parser )
@@ -184,25 +184,25 @@ static int Open( vlc_object_t *p_this )
     /* Build an SMB URI
      * smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */
 
-    if( !psz_user ) psz_user = var_CreateGetString( p_access, "smb-user" );
+    if( !psz_user ) psz_user = var_InheritString( p_access, "smb-user" );
     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 = var_InheritString( p_access, "smb-pwd" );
     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 = var_InheritString( 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);
-    i_ret = asprintf( &psz_uri, "//%s", psz_path );
+        Win32AddConnection( p_access, psz_location, psz_user, psz_pwd, psz_domain);
+    i_ret = asprintf( &psz_uri, "//%s", psz_location );
 #else
     if( psz_user )
         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 );
+                          psz_pwd ? psz_pwd : "", psz_location );
     else
-        i_ret = asprintf( &psz_uri, "smb://%s", psz_path );
+        i_ret = asprintf( &psz_uri, "smb://%s", psz_location );
 #endif
 
     free( psz_user );
@@ -230,7 +230,8 @@ static int Open( vlc_object_t *p_this )
 #endif
     if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
     {
-        msg_Err( p_access, "open failed for '%s' (%m)", p_access->psz_path );
+        msg_Err( p_access, "open failed for '%s' (%m)",
+                 p_access->psz_location );
         free( psz_uri );
         return VLC_EGENERIC;
     }
@@ -272,12 +273,13 @@ static void Close( vlc_object_t *p_this )
 /*****************************************************************************
  * Seek: try to go at the right place
  *****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int64_t      i_ret;
 
-    if( i_pos < 0 ) return VLC_EGENERIC;
+    if( i_pos >= INT64_MAX )
+        return VLC_EGENERIC;
 
     msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
 
@@ -333,7 +335,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
     case ACCESS_GET_PTS_DELAY:
         *va_arg( args, int64_t * )
-                  = (int64_t)var_GetInteger( p_access, "smb-caching" ) * 1000;
+                  = var_GetInteger( p_access, "smb-caching" ) * 1000;
         break;
 
     case ACCESS_SET_PAUSE_STATE: