Don't create a logfile for --background if we're --quiet.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7201511a9cc10d463a8f93cb19a2296b4624a03d..2746126321ad4e48a648bb437a97f26f98a5e779 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-12  Micah Cowan  <micah@cowan.name>
+
+       * 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.
+
+       * utils.c (fork_to_background): Likewise.
+
 2008-04-11  Micah Cowan  <micah@cowan.name>
 
        * ftp.c (getftp, ftp_loop_internal): Don't append to an existing

diff --git a/src/mswindows.c b/src/mswindows.c
index 40f0d7626b31c43888b0f3ed6dc7bfcb884f1adc..5fe764e1979e93ec0d50471979cbce7c2b2849a9 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -157,6 +157,10 @@ fake_fork_child (void)
   event = info->event;
 
   info->logfile_changed = false;
+  if (opt.quiet && !opt.server_response)
+    {
+      log_close ();
+    }
   if (!opt.lfilename)
     {
       /* See utils:fork_to_background for explanation. */
@@ -289,7 +293,8 @@ fake_fork (void)
       goto cleanup;
     }
 
-  printf (_("Continuing in background, pid %lu.\n"), pi.dwProcessId);
+  if (!opt.quiet)
+    printf (_("Continuing in background, pid %lu.\n"), pi.dwProcessId);
   if (info->logfile_changed)
     printf (_("Output will be written to `%s'.\n"), info->lfilename);
 

diff --git a/src/utils.c b/src/utils.c
index 3fd1435ec20d59326d20078006fbfacb02aeecfb..4d0560ee38771da9f31f2df67c2df884f1bee778 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -301,6 +301,13 @@ 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)
     {
       /* We must create the file immediately to avoid either a race
@@ -325,7 +332,8 @@ fork_to_background (void)
   else if (pid != 0)
     {
       /* parent, no error */
-      printf (_("Continuing in background, pid %d.\n"), (int) pid);
+      if (!quiet)
+        printf (_("Continuing in background, pid %d.\n"), (int) pid);
       if (logfile_changed)
         printf (_("Output will be written to `%s'.\n"), opt.lfilename);
       exit (0);                 /* #### should we use _exit()? */