[svn] Make `-c' and `-O' work together.

[wget] / src / http.c

diff --git a/src/http.c b/src/http.c
index 4c65d6774d16201ebb731b463845409cd6262a1b..7c40d060092a42a150334716c4341d49fceb28ad 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1305,6 +1305,9 @@ Accept: %s\r\n\
          /* This will silently fail for streams that don't correspond
             to regular files, but that's OK.  */
          rewind (fp);
+         /* ftruncate is needed because opt.dfp is opened in append
+            mode if opt.always_rest is set.  */
+         ftruncate (fileno (fp), 0);
          clearerr (fp);
        }
     }
@@ -1487,8 +1490,8 @@ File `%s' already there, will not retrieve.\n"), u->local);
       hstat.restval = 0L;
       /* Decide whether or not to restart.  */
       if (((count > 1 && (*dt & ACCEPTRANGES)) || opt.always_rest)
-         && file_exists_p (u->local))
-       if (stat (u->local, &st) == 0)
+         && file_exists_p (locf))
+       if (stat (locf, &st) == 0 && S_ISREG (st.st_mode))
          hstat.restval = st.st_size;
       /* Decide whether to send the no-cache directive.  */
       if (u->proxy && (count > 1 || (opt.proxy_cache == 0)))