emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: do not ftruncate if -O- is used, closes 13351

Browse Source 
function                                             old     new   delta
wget_main                                           2558    2571     +13
retrieve_file_data                                   612     621      +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 22/0)               Total: 22 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-08 19:06:28 +01:00
parent abaee4aada
commit e7d853b4eb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
networking/wget.c
View File

@ -287,6 +287,8 @@ enum {
WGET_OPT_POST_DATA = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS, WGET_OPT_POST_DATA = (1 << 12) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
WGET_OPT_SPIDER = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS, WGET_OPT_SPIDER = (1 << 13) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
WGET_OPT_NO_CHECK_CERT = (1 << 14) * ENABLE_FEATURE_WGET_LONG_OPTIONS, WGET_OPT_NO_CHECK_CERT = (1 << 14) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
/* hijack this bit for other than opts purposes: */
WGET_NO_FTRUNCATE = (1 << 31)
}; };
enum { enum {
@ -1052,9 +1054,14 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
*/ */
{ {
off_t pos = lseek(G.output_fd, 0, SEEK_CUR); off_t pos = lseek(G.output_fd, 0, SEEK_CUR);
if (pos != (off_t)-1) if (pos != (off_t)-1) {
/* do not truncate if -O- is in use, a user complained about
* "wget -qO- 'http://example.com/empty' >>FILE" truncating FILE.
*/
if (!(option_mask32 & WGET_NO_FTRUNCATE))
ftruncate(G.output_fd, pos); ftruncate(G.output_fd, pos);
} }
}
if (!(option_mask32 & WGET_OPT_QUIET)) { if (!(option_mask32 & WGET_OPT_QUIET)) {
if (G.output_fd == 1) if (G.output_fd == 1)
@ -1566,7 +1573,7 @@ IF_DESKTOP( "no-parent\0" No_argument "\xf0")
if (G.fname_out) { /* -O FILE ? */ if (G.fname_out) { /* -O FILE ? */
if (LONE_DASH(G.fname_out)) { /* -O - ? */ if (LONE_DASH(G.fname_out)) { /* -O - ? */
G.output_fd = 1; G.output_fd = 1;
option_mask32 &= ~WGET_OPT_CONTINUE; option_mask32 = (option_mask32 & (~WGET_OPT_CONTINUE)) | WGET_NO_FTRUNCATE;
} }
/* compat with wget: -O FILE can overwrite */ /* compat with wget: -O FILE can overwrite */
G.o_flags = O_WRONLY | O_CREAT | O_TRUNC; G.o_flags = O_WRONLY | O_CREAT | O_TRUNC;