diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /findutils/xargs.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils/xargs.c')
| -rw-r--r-- | findutils/xargs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c index e5384d14c..97afef039 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
| @@ -508,13 +508,8 @@ int xargs_main(int argc, char **argv) | |||
| 508 | 508 | ||
| 509 | INIT_G(); | 509 | INIT_G(); |
| 510 | 510 | ||
| 511 | #if ENABLE_DESKTOP && ENABLE_LONG_OPTS | 511 | opt = getopt32long(argv, OPTION_STR, |
| 512 | /* For example, Fedora's build system uses --no-run-if-empty */ | 512 | "no-run-if-empty\0" No_argument "r", |
| 513 | applet_long_options = | ||
| 514 | "no-run-if-empty\0" No_argument "r" | ||
| 515 | ; | ||
| 516 | #endif | ||
| 517 | opt = getopt32(argv, OPTION_STR, | ||
| 518 | &max_args, &max_chars, &G.eof_str, &G.eof_str | 513 | &max_args, &max_chars, &G.eof_str, &G.eof_str |
| 519 | IF_FEATURE_XARGS_SUPPORT_REPL_STR(, &G.repl_str, &G.repl_str) | 514 | IF_FEATURE_XARGS_SUPPORT_REPL_STR(, &G.repl_str, &G.repl_str) |
| 520 | ); | 515 | ); |