From: Rob Landley <rob@landley.net>
Date: Tue, 8 Nov 2005 00:52:31 +0000 (-0000)
Subject: Patch from Tomasz Mateja: don't try to CWD to a _filename_, just send the full
X-Git-Tag: 1_1_0~480
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f03722448c35d825cd36a381725d6481920071d;p=oweals%2Fbusybox.git

Patch from Tomasz Mateja: don't try to CWD to a _filename_, just send the full
path to the STOR command.
---

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 02c21d9e1..1d5b18624 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -10,20 +10,7 @@
  * Based on wget.c by Chip Rosenthal Covad Communications
  * <chip@laserlink.net>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <sys/types.h>
@@ -229,10 +216,6 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream,
 	}
 	fd_data = xconnect_ftpdata(server, buf);
 
-	if (ftpcmd("CWD ", server_path, control_stream, buf) != 250) {
-		bb_error_msg_and_die("CWD error: %s", buf + 4);
-	}
-
 	/* get the local file */
 	if ((local_path[0] == '-') && (local_path[1] == '\0')) {
 		fd_local = STDIN_FILENO;
@@ -252,7 +235,7 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream,
 			break;
 		}
 	}
-	response = ftpcmd("STOR ", local_path, control_stream, buf);
+	response = ftpcmd("STOR ", server_path, control_stream, buf);
 	switch (response) {
 	case 125:
 	case 150: