aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-10-31 17:13:47 +0000
committerRon Yorston <rmy@pobox.com>2015-10-31 17:13:47 +0000
commit4432dbba6559d3d88e18ecf2c33d9e5a39e82074 (patch)
treef6db886523a04e0b45926336223ff8c32761dc43 /findutils
parentbc09f29f78547856e2152dc47051aeed548f28e8 (diff)
parent6bd3fff51aa74e2ee2d87887b12182a3b09792ef (diff)
downloadbusybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.gz
busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.bz2
busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
-rw-r--r--findutils/xargs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c
index dba74ea61..8b7ab7b6a 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -590,6 +590,9 @@ int xargs_main(int argc, char **argv)
590 G.argv = argv; 590 G.argv = argv;
591 argc = 0; 591 argc = 0;
592 read_args = process_stdin_with_replace; 592 read_args = process_stdin_with_replace;
593 /* Make -I imply -r. GNU findutils seems to do the same: */
594 /* (otherwise "echo -n | xargs -I% echo %" would SEGV) */
595 opt |= OPT_NO_EMPTY;
593 } else 596 } else
594#endif 597#endif
595 { 598 {