* ftpfs.c (linear_abort): Close data socket dsock.

vfs/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-12  Andrew V. Samoilov  <sav@bcs.zp.ua>
+
+	* ftpfs.c (linear_abort): Close data socket dsock.
+
 2002-11-11  Pavel Roskin  <proski@gnu.org>
 
 	* vfs.h [USE_VFS] (mc_setctl): Specify argument types.
@@ -1998,7 +2002,7 @@
 	Return a strdupped string now.
 	(send_ftp_command): Release translate_path result here.
 	(open_data_connection): Release translate_path result here.
-	(ftpfs_chdir_internal): Reease it here too.
+	(ftpfs_chdir_internal): Release it here too.
 
 1999-08-30  Norbert Warmuth  <nwarmuth@privat.circular.de>
 

vfs/ftpfs.c

@@ -996,11 +996,15 @@ linear_abort (vfs *me, vfs_s_fh *fh)
     if (send (SUP.sock, ipbuf, sizeof (ipbuf), MSG_OOB) != sizeof (ipbuf)) {
 	print_vfs_message (_("ftpfs: abort error: %s"),
 			   unix_error_string (errno));
+	if (dsock != -1)
+	    close (dsock);
 	return;
     }
 
     if (command (me, super, NONE, "%cABOR", DM) != COMPLETE) {
 	print_vfs_message (_("ftpfs: abort failed"));
+	if (dsock != -1)
+	    close (dsock);
 	return;
     }
     if (dsock != -1) {
@@ -1019,11 +1023,8 @@ linear_abort (vfs *me, vfs_s_fh *fh)
 		}
 	    }
 	}
-    }
-
-    if (dsock != -1)
 	close (dsock);
-
+    }
     if ((get_reply (me, SUP.sock, NULL, 0) == TRANSIENT) && (code == 426))
 	get_reply (me, SUP.sock, NULL, 0);
 }