Revert 2444.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c98e93d4fa3e73f46ced4b943db0bde8a79a6a8..d9000556ac267bc303871d1dc58a41cd6c024a3e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-22  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       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  <gscrivano@gnu.org>
 
        * ftp.c (getftp): If `count' is bigger than zero, try to resume the

diff --git a/src/ftp.c b/src/ftp.c
index c331d066f2c6569ca2434794367244f3d5a94f17..8dddeed89cba85e1d83db44562c3a9c208edf059 100644 (file)
--- 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 99f58b3f1a9d3ea69e312c495437eb34cbe2e3dd..a0e41cac01791916e0561d2809c0928b22e1b47a 100644 (file)
--- 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))
            {