mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Don't create a logfile for --background if we're --quiet.
This commit is contained in:
parent
aed143ea0c
commit
7783870db1
@ -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>
|
2008-04-11 Micah Cowan <micah@cowan.name>
|
||||||
|
|
||||||
* ftp.c (getftp, ftp_loop_internal): Don't append to an existing
|
* ftp.c (getftp, ftp_loop_internal): Don't append to an existing
|
||||||
|
@ -157,6 +157,10 @@ fake_fork_child (void)
|
|||||||
event = info->event;
|
event = info->event;
|
||||||
|
|
||||||
info->logfile_changed = false;
|
info->logfile_changed = false;
|
||||||
|
if (opt.quiet && !opt.server_response)
|
||||||
|
{
|
||||||
|
log_close ();
|
||||||
|
}
|
||||||
if (!opt.lfilename)
|
if (!opt.lfilename)
|
||||||
{
|
{
|
||||||
/* See utils:fork_to_background for explanation. */
|
/* See utils:fork_to_background for explanation. */
|
||||||
@ -289,7 +293,8 @@ fake_fork (void)
|
|||||||
goto cleanup;
|
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)
|
if (info->logfile_changed)
|
||||||
printf (_("Output will be written to `%s'.\n"), info->lfilename);
|
printf (_("Output will be written to `%s'.\n"), info->lfilename);
|
||||||
|
|
||||||
|
10
src/utils.c
10
src/utils.c
@ -301,6 +301,13 @@ fork_to_background (void)
|
|||||||
/* Whether we arrange our own version of opt.lfilename here. */
|
/* Whether we arrange our own version of opt.lfilename here. */
|
||||||
bool logfile_changed = false;
|
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)
|
||||||
{
|
{
|
||||||
/* We must create the file immediately to avoid either a race
|
/* We must create the file immediately to avoid either a race
|
||||||
@ -325,7 +332,8 @@ fork_to_background (void)
|
|||||||
else if (pid != 0)
|
else if (pid != 0)
|
||||||
{
|
{
|
||||||
/* parent, no error */
|
/* 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)
|
if (logfile_changed)
|
||||||
printf (_("Output will be written to `%s'.\n"), opt.lfilename);
|
printf (_("Output will be written to `%s'.\n"), opt.lfilename);
|
||||||
exit (0); /* #### should we use _exit()? */
|
exit (0); /* #### should we use _exit()? */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user