[svn] Make sure hstat.no_truncate gets properly initialized.

Published in <sxspudk6pdl.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 343fa75a47ea2aa02996ea8e87d7008da7a22e71..7098b0c96b4fcdab7bf8a8dac47e4a253d0821a5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-08  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * http.c (http_loop): Reset no_truncate before deciding whether to
+       set it.
+       (gethttp): Further clarify "-c conflicts with existing file" error
+       message, based on input from Herold Heiko.
+
 2001-05-07  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * http.c (http_loop): If restval is set, set no_truncate to 1

diff --git a/src/http.c b/src/http.c
index b61f7de04aaed2db2924c936a55e8b230c494187..bf6a57ea9848301cf9592d5b9562f964d08aec30 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1211,7 +1211,7 @@ Accept: %s\r\n\
                         _("\
 \n\
 The server does not support continued downloads, which conflicts with `-c'.\n\
-Refusing to truncate `%s'.\n\n"), u->local);
+Refusing to truncate existing file `%s'.\n\n"), u->local);
              FREE_MAYBE (type);
              FREE_MAYBE (all_headers);
              CLOSE_INVALIDATE (sock);
@@ -1522,6 +1522,7 @@ File `%s' already there, will not retrieve.\n"), u->local);
       /* In `-c' is used and the file is existing and non-empty,
         refuse to truncate it if the server doesn't support continued
         downloads.  */
+      hstat.no_truncate = 0;
       if (opt.always_rest && hstat.restval)
        hstat.no_truncate = 1;