smb.c: protect open call, sounds like open is macro in latest glibc ? patch by kwizart

[vlc] / modules / access / smb.c

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 50bc3cc8118b12037fc262a113b967a6f917890b..72b85367e300842c5cf09d5040c3f6008f614d09 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -24,10 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
+
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
 
 #ifdef WIN32
 #ifdef HAVE_FCNTL_H
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
         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) );
@@ -235,11 +235,12 @@ static int Open( vlc_object_t *p_this )
         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
@@ -250,7 +251,7 @@ static int Open( vlc_object_t *p_this )
     }
 #endif
 
-    if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
+    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) );
@@ -258,7 +259,9 @@ static int Open( vlc_object_t *p_this )
         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;
@@ -266,19 +269,6 @@ static int Open( vlc_object_t *p_this )
 
     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;
@@ -457,17 +447,15 @@ static void Win32AddConnection( access_t *p_access, char *psz_path,
     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;