diff options
author | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:42:39 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:45:21 +0100 |
commit | 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch) | |
tree | be9337069b60ca1bb03565d8575bacfc71181003 /findutils/xargs.c | |
parent | ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff) | |
parent | ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff) | |
download | busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils/xargs.c')
-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 8331931bc..e0dbcbc7a 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
@@ -756,7 +756,7 @@ int xargs_main(int argc UNUSED_PARAM, char **argv) | |||
756 | } | 756 | } |
757 | /* Sanity check */ | 757 | /* Sanity check */ |
758 | if (n_max_chars <= 0) { | 758 | if (n_max_chars <= 0) { |
759 | bb_error_msg_and_die("can't fit single argument within argument list size limit"); | 759 | bb_simple_error_msg_and_die("can't fit single argument within argument list size limit"); |
760 | } | 760 | } |
761 | 761 | ||
762 | buf = xzalloc(n_max_chars + 1); | 762 | buf = xzalloc(n_max_chars + 1); |
@@ -807,7 +807,7 @@ int xargs_main(int argc UNUSED_PARAM, char **argv) | |||
807 | 807 | ||
808 | if (!G.args[initial_idx]) { /* not even one ARG was added? */ | 808 | if (!G.args[initial_idx]) { /* not even one ARG was added? */ |
809 | if (*rem != '\0') | 809 | if (*rem != '\0') |
810 | bb_error_msg_and_die("argument line too long"); | 810 | bb_simple_error_msg_and_die("argument line too long"); |
811 | if (opt & OPT_NO_EMPTY) | 811 | if (opt & OPT_NO_EMPTY) |
812 | break; | 812 | break; |
813 | } | 813 | } |