aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-01-10 06:36:00 +0000
committerRob Landley <rob@landley.net>2006-01-10 06:36:00 +0000
commitbc059bc7fa4383813f0772a380b59a643af79636 (patch)
tree45239bc2f692ba429aee95b6c343b8d48243f328
parent9e4100bf95ab2f1b9a2fe76a8ac0e7a3666cd8b1 (diff)
downloadbusybox-w32-bc059bc7fa4383813f0772a380b59a643af79636.tar.gz
busybox-w32-bc059bc7fa4383813f0772a380b59a643af79636.tar.bz2
busybox-w32-bc059bc7fa4383813f0772a380b59a643af79636.zip
The brain-dead FTP servers on Solaris don't support the size command.
-rw-r--r--networking/ftpgetput.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 1d5b18624..7a0ba7772 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -143,6 +143,9 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
143 if (safe_strtoul(buf + 4, &value)) 143 if (safe_strtoul(buf + 4, &value))
144 bb_error_msg_and_die("SIZE error: %s", buf + 4); 144 bb_error_msg_and_die("SIZE error: %s", buf + 4);
145 filesize = value; 145 filesize = value;
146 } else {
147 filesize = -1;
148 do_continue = 0;
146 } 149 }
147 150
148 if ((local_path[0] == '-') && (local_path[1] == '\0')) { 151 if ((local_path[0] == '-') && (local_path[1] == '\0')) {
@@ -185,8 +188,12 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
185 } 188 }
186 189
187 /* Copy the file */ 190 /* Copy the file */
188 if (bb_copyfd_size(fd_data, fd_local, filesize) == -1) { 191 if (filesize != -1) {
189 exit(EXIT_FAILURE); 192 if (-1 == bb_copyfd_size(fd_data, fd_local, filesize))
193 exit(EXIT_FAILURE);
194 } else {
195 if (-1 == bb_copyfd_eof(fd_data, fd_local))
196 exit(EXIT_FAILURE);
190 } 197 }
191 198
192 /* close it all down */ 199 /* close it all down */