From 105627124e9db524f79719753560b2e555943e9b Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Tue, 8 May 2001 04:47:05 -0700
Subject: [PATCH] [svn] Make sure hstat.no_truncate gets properly initialized.
Published in <sxspudk6pdl.fsf@florida.arsdigita.de>.
---
src/ChangeLog | 7 +++++++
src/http.c | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 343fa75a..7098b0c9 100644
--- 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 b61f7de0..bf6a57ea 100644
--- 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;