From 447234095775f605505dca229f75d9492f544789 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 1 Mar 2014 22:42:38 +0000 Subject: [PATCH] [FTP] Fix download with ftp.exe, the problem was that we didn't switch download mode to binary when needed, because of idiotic defines used that where pointless here. We have this bug since revision 12776... Patch by Alexander Varnin, see CORE-3682 for details. CORE-3682 #resolve #comment Committed in revision, cheers ;) svn path=/trunk/; revision=62372 --- reactos/base/applications/network/ftp/cmds.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/reactos/base/applications/network/ftp/cmds.c b/reactos/base/applications/network/ftp/cmds.c index 4b9c08df167..dd752ec7ab9 100644 --- a/reactos/base/applications/network/ftp/cmds.c +++ b/reactos/base/applications/network/ftp/cmds.c @@ -85,18 +85,11 @@ void setpeer(int argc, const char *argv[]) } host = hookup(argv[1], portnum); if (host) { -#if defined(unix) && NBBY == 8 int overbose; -#endif connected = 1; if (autologin) (void) login(argv[1]); -#if defined(unix) && NBBY == 8 -/* - * this ifdef is to keep someone form "porting" this to an incompatible - * system and not checking this out. This way they have to think about it. - */ overbose = verbose; if (debug == 0) verbose = -1; @@ -119,7 +112,7 @@ void setpeer(int argc, const char *argv[]) *cp = c; } if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) { - setbinary(); + setbinary(0, NULL); /* allbinary = 1; this violates the RFC */ if (overbose) printf("Using %s mode to transfer files.\n", @@ -130,7 +123,6 @@ void setpeer(int argc, const char *argv[]) "Remember to set tenex mode when transfering binary files from this machine.\n"); } verbose = overbose; -#endif /* unix */ } (void) fflush(stdout); } -- 2.17.1