Don't want to close log if an explicit -o was given. Let reopen to /dev/null handle...

diff --git a/src/ChangeLog b/src/ChangeLog
index 2746126321ad4e48a648bb437a97f26f98a5e779..2a54ffe77d75d61d21dd1a2696b83b4eadf96051 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,15 @@
 2008-04-12  Micah Cowan  <micah@cowan.name>
 
+       * mswindows.c (fake_fork_child): Don't mention that we're
+       backgrounding if --quiet is used.
+
+       * utils.c (fork_to_background): Likewise.
+       
+2008-04-12  Rabin Vincent  <rabin@rab.in>
+
        * mswindows.c (fake_fork_child): Don't create a logfile for
        --background when --quiet is used, but not --server-response.
-       Don't mention that we're backgrounding if --quiet is used. Based
-       on a patch submitted by Rabin Vincent <rabin@rab.in>.  Fixes bug
-       #20917.
+       Fixes bug #20917.
 
        * utils.c (fork_to_background): Likewise.
 

diff --git a/src/mswindows.c b/src/mswindows.c
index 5fe764e1979e93ec0d50471979cbce7c2b2849a9..9d5141f1c740941018c17fb4f31c1651bc178446 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -157,11 +157,7 @@ fake_fork_child (void)
   event = info->event;
 
   info->logfile_changed = false;
-  if (opt.quiet && !opt.server_response)
-    {
-      log_close ();
-    }
-  if (!opt.lfilename)
+  if (!opt.lfilename && (!opt.quiet || opt.server_response))
     {
       /* See utils:fork_to_background for explanation. */
       FILE *new_log_fp = unique_create (DEFAULT_LOGFILE, false, &opt.lfilename);

diff --git a/src/utils.c b/src/utils.c
index 4d0560ee38771da9f31f2df67c2df884f1bee778..7aac94fdbee79f2937682879ab542d97ffcd122c 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -301,14 +301,7 @@ fork_to_background (void)
   /* Whether we arrange our own version of opt.lfilename here.  */
   bool logfile_changed = false;
 
-  if (opt.quiet && !opt.server_response)
-    {
-      /* Don't bother with a logfile, there are virtually no logs we
-         issue in quiet mode. (Server responses in FTP are the
-         exception, when enabled.) */
-      log_close ();
-    }
-  if (!opt.lfilename)
+  if (!opt.lfilename && (!opt.quiet || opt.server_response))
     {
       /* We must create the file immediately to avoid either a race
          condition (which arises from using unique_name and failing to