diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:54:58 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:54:58 +1000 |
| commit | 1a286d510c2125bdab601ce47afd4d27b6ce6f41 (patch) | |
| tree | 0c17899352c5961b5e402dedd5813794f937e593 /findutils | |
| parent | 9df56f96fd9a213189ca94c1fccfc3c42bd9c16a (diff) | |
| parent | 19ced5c4253bc154aa499a72b6343e01245c92c0 (diff) | |
| download | busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.tar.gz busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.tar.bz2 busybox-w32-1a286d510c2125bdab601ce47afd4d27b6ce6f41.zip | |
Merge branch 'origin/master' (early part)
Conflicts:
libbb/Kbuild.src
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/xargs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c index 7db374c4a..9133b8f6c 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
| @@ -529,11 +529,11 @@ int xargs_main(int argc, char **argv) | |||
| 529 | if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) { | 529 | if (opt & (OPT_INTERACTIVE | OPT_VERBOSE)) { |
| 530 | for (i = 0; args[i]; i++) { | 530 | for (i = 0; args[i]; i++) { |
| 531 | if (i) | 531 | if (i) |
| 532 | fputc(' ', stderr); | 532 | bb_putchar_stderr(' '); |
| 533 | fputs(args[i], stderr); | 533 | fputs(args[i], stderr); |
| 534 | } | 534 | } |
| 535 | if (!(opt & OPT_INTERACTIVE)) | 535 | if (!(opt & OPT_INTERACTIVE)) |
| 536 | fputc('\n', stderr); | 536 | bb_putchar_stderr('\n'); |
| 537 | } | 537 | } |
| 538 | if (!(opt & OPT_INTERACTIVE) || xargs_ask_confirmation()) { | 538 | if (!(opt & OPT_INTERACTIVE) || xargs_ask_confirmation()) { |
| 539 | child_error = xargs_exec(args); | 539 | child_error = xargs_exec(args); |