commit 54eacd0b20a4018abcf16eab490e0f553267239a
from: rsc <devnull@localhost>
date: Fri Dec 30 17:07:24 2005 UTC

try to make ftp work

commit - 9e36143a34451aba972b157a53160f1badff9ceb
commit + 54eacd0b20a4018abcf16eab490e0f553267239a
blob - 582933bed7e3e776c48cc5773ce07e503d511dac
blob + 66fb60dabd0c68ea47ee0952e2f7a7328f09c7be
--- src/cmd/hget.c
+++ src/cmd/hget.c
@@ -856,23 +856,18 @@ doftp(URL *u, URL *px, Range *r, Out *out, long mtime)
 	int pid, ctl, data, rv;
 	Waitmsg *w;
 	char msg[64];
-	char conndir[NETPATHLEN];
-	char *p;
 
 	/* untested, proxy dosn't work with ftp (I think) */
 	if(px->host == nil){
-		ctl = dial(netmkaddr(u->host, tcpdir, u->port), 0, conndir, 0);
+		ctl = dial(netmkaddr(u->host, tcpdir, u->port), 0, 0, 0);
 	} else {
-		ctl = dial(netmkaddr(px->host, tcpdir, px->port), 0, conndir, 0);
+		ctl = dial(netmkaddr(px->host, tcpdir, px->port), 0, 0, 0);
 	}
 
 	if(ctl < 0)
 		return Error;
-	if(net == nil){
-		p = strrchr(conndir, '/');
-		*p = 0;
-		snprint(tcpdir, sizeof(tcpdir), conndir);
-	}
+	if(net == nil)
+		strcpy(tcpdir, "tcp");
 
 	initibuf();