Revert "Update to 7.44.0"

[platform/upstream/curl.git] / src / tool_cb_wrt.c

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index fa47dd3..dfbf95c 100644 (file)
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -39,7 +39,7 @@ size_t tool_write_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
 {
   size_t rc;
   struct OutStruct *outs = userdata;
-  struct Configurable *config = outs->config;
+  struct OperationConfig *config = outs->config;
 
   /*
    * Once that libcurl has called back tool_write_cb() the returned value
@@ -86,7 +86,7 @@ size_t tool_write_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
       /* standard stream */
       if(!outs->stream || outs->s_isreg || outs->fopened)
         check_fails = TRUE;
-      if(outs->alloc_filename || outs->init)
+      if(outs->alloc_filename || outs->is_cd_filename || outs->init)
         check_fails = TRUE;
     }
     if(check_fails) {
@@ -104,7 +104,7 @@ size_t tool_write_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
       return failure;
     }
 
-    if(config->content_disposition) {
+    if(outs->is_cd_filename) {
       /* don't overwrite existing files */
       file = fopen(outs->filename, "rb");
       if(file) {