From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 25 May 2005 12:26:38 +0000 (+0000)
Subject: added function for individual ftp slave kills
X-Git-Tag: curl-7_14_1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac5635f77da7e01a4061881521528acafb726827;p=thirdparty%2Fcurl.git

added function for individual ftp slave kills
---

diff --git a/tests/ftp.pm b/tests/ftp.pm
index 25d7df7452..015f9f08a0 100644
--- a/tests/ftp.pm
+++ b/tests/ftp.pm
@@ -29,6 +29,24 @@ sub checkserver {
     return 0;
 }
 
+#############################################################################
+# Kill a specific slave
+#
+sub ftpkillslave {
+    my ($id, $ext, $verbose)=@_;
+    my $base;
+    for $base (('filt', 'data')) {
+        my $f = ".sock$base$id$ext.pid";
+        my $pid = checkserver($f);
+        if($pid > 0) {
+            printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid) if($verbose);
+            kill (9, $pid); # die!
+        }
+        unlink($f);
+    }
+}
+
+
 #############################################################################
 # Make sure no FTP leftovers are still running. Kill all slave processes.
 # This uses pidfiles since it might be used by other processes.
@@ -37,15 +55,7 @@ sub ftpkillslaves {
     my ($versbose) = @_;
     for $ext (("", "ipv6")) {
         for $id (("", "2")) {
-            for $base (('filt', 'data')) {
-                my $f = ".sock$base$id$ext.pid";
-                my $pid = checkserver($f);
-                if($pid > 0) {
-		    printf ("* kill pid for %-5s => %-5d\n", "ftp-$base$id$ext", $pid) if($verbose);
-                    kill (9, $pid); # die!
-                }
-                unlink($f);
-            }
+            ftpkillslave ($id, $ext, $verbose);
         }
     }
 }