From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 2 May 2005 09:08:02 +0000 (+0000)
Subject: Make sure there's no pidfile if we cannot start the initial sockfilt tool -
X-Git-Tag: curl-7_14_0~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3eea61f1fb487318ec7958af491e86aa821ce8b;p=curl

Make sure there's no pidfile if we cannot start the initial sockfilt tool -
this happens for some ipv6-enabled hosts on which sockfilt cannot listen
on ipv6.
---

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 6c8969745..3aed88b59 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -128,11 +128,12 @@ sub startsf {
     open(STDOUT, ">&SFWRITE")   || die "can't dup client to stdout";
 }
 
-startsf();
+# remove the file here so that if startsf() fails, it is very noticable 
+unlink(".ftp$ftpdnum.pid");
 
-logmsg sprintf("FTP server started on port IPv%d/$port\n",
-               $ipv6?6:4);
+startsf();
 
+logmsg sprintf("FTP server started on port IPv%d/$port\n", $ipv6?6:4);
 open(PID, ">.ftp$ftpdnum.pid");
 print PID $$;
 close(PID);