[svn] Improvements/fixes to HTTP Content-Disposition header support.

[wget] / src / init.c

diff --git a/src/init.c b/src/init.c
index 26b52a5793b1bdf6e244a0e0fc5b3068b428471f..2e51291a997ed450512a1f4dc1144a810e9ba5f4 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -126,6 +126,7 @@ static struct {
   { "connecttimeout",  &opt.connect_timeout,   cmd_time },
   { "continue",                &opt.always_rest,       cmd_boolean },
   { "convertlinks",    &opt.convert_links,     cmd_boolean },
+  { "contentdisposition", &opt.content_disposition, cmd_boolean },
   { "cookies",         &opt.cookies,           cmd_boolean },
   { "cutdirs",         &opt.cut_dirs,          cmd_number },
 #ifdef ENABLE_DEBUG
@@ -313,6 +314,8 @@ defaults (void)
   opt.restrict_files_os = restrict_windows;
 #endif
   opt.restrict_files_ctrl = true;
+
+  opt.content_disposition = true;
 }
 \f
 /* Return the user's home directory (strdup-ed), or NULL if none is
@@ -1427,15 +1430,7 @@ cleanup (void)
   /* Free external resources, close files, etc. */
 
   if (output_stream)
-    {
-      fclose (output_stream);
-      if (opt.output_document 
-          && !(total_downloaded_bytes > 0))
-        {
-          unlink (opt.output_document);
-        }
-    }
-  
+    fclose (output_stream);
   /* No need to check for error because Wget flushes its output (and
      checks for errors) after any data arrives.  */