head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1
	OPENPKG_E1_FP:1.1
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1
	OPENPKG_2_STABLE_20060622:1.1
	OPENPKG_2_STABLE:1.1.0.22
	OPENPKG_2_STABLE_BP:1.1
	OPENPKG_2_5_RELEASE:1.1
	OPENPKG_2_5_SOLID:1.1.0.20
	OPENPKG_2_5_SOLID_BP:1.1
	OPENPKG_2_4_RELEASE:1.1
	OPENPKG_2_4_SOLID:1.1.0.18
	OPENPKG_2_4_SOLID_BP:1.1
	OPENPKG_CW_FP:1.1
	OPENPKG_2_3_RELEASE:1.1
	OPENPKG_2_3_SOLID:1.1.0.16
	OPENPKG_2_3_SOLID_BP:1.1
	OPENPKG_2_2_RELEASE:1.1
	OPENPKG_2_2_SOLID:1.1.0.14
	OPENPKG_2_2_SOLID_BP:1.1
	OPENPKG_2_1_RELEASE:1.1
	OPENPKG_2_1_SOLID:1.1.0.12
	OPENPKG_2_1_SOLID_BP:1.1
	OPENPKG_2_0_RELEASE:1.1
	OPENPKG_2_0_SOLID:1.1.0.10
	OPENPKG_2_0_SOLID_BP:1.1
	OPENPKG_1_3_RELEASE:1.1
	OPENPKG_1_3_SOLID:1.1.0.8
	OPENPKG_1_3_SOLID_BP:1.1
	OPENPKG_1_STABLE_MP:1.1
	OPENPKG_1_2_RELEASE:1.1
	OPENPKG_1_2_SOLID:1.1.0.6
	OPENPKG_1_2_SOLID_BP:1.1
	OPENPKG_1_STABLE:1.1.0.4
	OPENPKG_1_STABLE_BP:1.1
	OPENPKG_1_1_RELEASE:1.1
	OPENPKG_1_1_SOLID:1.1.0.2
	OPENPKG_1_1_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.1
date	2002.05.29.19.56.13;	author rse;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Finally rename all foo-X.Y.patch files to foo.patch in order
to allow us to preserve history in CVS for patch files.
@
text
@--- ftp.pl~	Fri Jun  5 11:10:27 1998
+++ ftp.pl	Sat Feb  3 13:59:12 2001
@@@@ -270,6 +270,13 @@@@
 	$SIG{ 'PIPE' } = "ftp'ftp__sighandler";
 }
 
+# Setup a signal handler for user interrupts.
+sub ftp'set_user_signals
+{
+	$ftp_logger = @@_;
+	$SIG{ 'INT' } = "ftp'ftp__sighandler";
+}
+
 # &ftp'set_namemap( function to map outgoing name,  function to map incoming )
 sub ftp'set_namemap
 {
@@@@ -581,6 +588,9 @@@@
 		return 0;
 	}
 
+	# shut down our end of the socket
+	&close_data_socket;
+
 	# read the close
 	#
 	$ret = &expect($timeout,
@@@@ -589,9 +599,6 @@@@
 		&service_closed();
 		$ret = 0;
 	}
-
-	# shut down our end of the socket
-	&close_data_socket;
 
 	if( ! $ret ){
 		return 0;
@