More fixes

(cherry picked from commit 020a810e)

modules/access/ftp.c

@@ -497,7 +497,6 @@ static int ftp_ReadCommand( access_t *p_access,
     int          i_answer;
 
     psz_line = net_Gets( p_access, p_sys->fd_cmd, NULL );
-    msg_Dbg( p_access, "answer=%s", psz_line );
     if( psz_line == NULL || strlen( psz_line ) < 3 )
     {
         msg_Err( p_access, "cannot get answer" );
@@ -506,6 +505,7 @@ static int ftp_ReadCommand( access_t *p_access,
         if( ppsz_answer ) *ppsz_answer  = NULL;
         return -1;
     }
+    msg_Dbg( p_access, "answer=%s", psz_line );
 
     if( psz_line[3] == '-' )    /* Multiple response */
     {
@@ -570,7 +570,7 @@ static int ftp_StartStream( access_t *p_access, off_t i_start )
         return VLC_EGENERIC;
     }
 
-    if( psz_ip != NULL )
+    if( *psz_ip )
     {
         char psz_fmt[7] = "(|||%u";
         psz_fmt[1] = psz_fmt[2] = psz_fmt[3] = psz_parser[1];
@@ -637,6 +637,12 @@ static int ftp_StartStream( access_t *p_access, off_t i_start )
         msg_Err( p_access, "cannot retreive file" );
         return VLC_EGENERIC;
     }
+
+    if( p_access->i_object_type == VLC_OBJECT_ACCESS )
+        net_StopSend( p_sys->fd_data );
+    else
+        net_StopRecv( p_sys->fd_data );
+
     return VLC_SUCCESS;
 }