From 8aa378bd9e725233b382cdffb6a108bf5752fcd9 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 22 Nov 2010 18:04:42 +0100 Subject: [PATCH] Revert 2444. --- src/ChangeLog | 6 ++++++ src/ftp.c | 4 ++-- src/http.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9c98e93d..d9000556 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-11-22 Giuseppe Scrivano + + Revert last commit. + * ftp.c (getftp): When count > 0, don't append to the existing file. + * http.c (gethttp): Likewise. + 2010-11-21 Giuseppe Scrivano * ftp.c (getftp): If `count' is bigger than zero, try to resume the diff --git a/src/ftp.c b/src/ftp.c index c331d066..8dddeed8 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -1152,7 +1152,7 @@ Error in server response, closing control connection.\n")); # define BIN_TYPE_FILE 1 #endif /* def __VMS [else] */ - if ((restval && !(con->cmd & DO_LIST)) || count > 0) + if (restval && !(con->cmd & DO_LIST)) { #ifdef __VMS int open_id; @@ -1172,7 +1172,7 @@ Error in server response, closing control connection.\n")); #endif /* def __VMS [else] */ } else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct - || opt.output_document) + || opt.output_document || count > 0) { if (opt.unlink && file_exists_p (con->target)) { diff --git a/src/http.c b/src/http.c index 99f58b3f..a0e41cac 100644 --- a/src/http.c +++ b/src/http.c @@ -2468,7 +2468,7 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file)); mkalldirs (hs->local_file); if (opt.backups) rotate_backups (hs->local_file); - if (hs->restval || count > 0) + if (hs->restval) { #ifdef __VMS int open_id; @@ -2479,7 +2479,7 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file)); fp = fopen (hs->local_file, "ab"); #endif /* def __VMS [else] */ } - else if (ALLOW_CLOBBER) + else if (ALLOW_CLOBBER || count > 0) { if (opt.unlink && file_exists_p (hs->local_file)) { -- 2.39.2