moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Exit with failure if -k is specified and -O is not a regular file.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-05-27 12:45:15 +02:00
parent 83fe87d9ed
commit d733dbc703
5 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -17,6 +17,8 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
** Ignore zero length domains in $no_proxy. ** Ignore zero length domains in $no_proxy.
** Set new cookies after an authorization failure. ** Set new cookies after an authorization failure.
** Exit with failure if -k is specified and -O is not a regular file.
* Changes in Wget 1.12 * Changes in Wget 1.12

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-27 Giuseppe Scrivano <gscrivano@gnu.org>
* wget.texi (Download Options): Document that -k can be used with -O
only with regular files.
2010-05-08 Giuseppe Scrivano <gscrivano@gnu.org> 2010-05-08 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am: Update copyright years. * Makefile.am: Update copyright years.

3
doc/wget.texi
View File

@ -579,7 +579,8 @@ some cases where this behavior can actually have some use.
Note that a combination with @samp{-k} is only permitted when Note that a combination with @samp{-k} is only permitted when
downloading a single document, as in that case it will just convert downloading a single document, as in that case it will just convert
all relative URIs to external ones; @samp{-k} makes no sense for all relative URIs to external ones; @samp{-k} makes no sense for
multiple URIs when they're all being downloaded to a single file. multiple URIs when they're all being downloaded to a single file;
@samp{-k} can be used only when the output is a regular file.
@cindex clobbering, file @cindex clobbering, file
@cindex downloading multiple times @cindex downloading multiple times

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-27 Giuseppe Scrivano <gscrivano@gnu.org>
* main.c (main): Exit with failure when -k is specified and -O is not
a regular file.
2010-05-27 Giuseppe Scrivano <gscrivano@gnu.org> 2010-05-27 Giuseppe Scrivano <gscrivano@gnu.org>
* http.c (gethttp): Consider new cookies retrieved when the * http.c (gethttp): Consider new cookies retrieved when the

7
src/main.c
View File

@ -1217,6 +1217,13 @@ WARNING: Can't reopen standard output in binary mode;\n\
if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode)) if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
output_stream_regular = true; output_stream_regular = true;
} }
if (!output_stream_regular && opt.convert_links)
{
printf (_("-k can be used together with -O only if outputting to \
a regular file.\n"));
print_usage ();
exit(1);
}
} }
#ifdef __VMS #ifdef __VMS