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/find.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/find.c')
| -rw-r--r-- | findutils/find.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/findutils/find.c b/findutils/find.c index 8706e2cf3..66ad36283 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
| @@ -1245,7 +1245,7 @@ static action*** parse_params(char **argv) | |||
| 1245 | * coreutils expects {} to appear only once in "-exec +" | 1245 | * coreutils expects {} to appear only once in "-exec +" |
| 1246 | */ | 1246 | */ |
| 1247 | if (all_subst != 1 && ap->filelist) | 1247 | if (all_subst != 1 && ap->filelist) |
| 1248 | bb_error_msg_and_die("only one '{}' allowed for -exec +"); | 1248 | bb_simple_error_msg_and_die("only one '{}' allowed for -exec +"); |
| 1249 | # endif | 1249 | # endif |
| 1250 | } | 1250 | } |
| 1251 | #endif | 1251 | #endif |
| @@ -1259,7 +1259,7 @@ static action*** parse_params(char **argv) | |||
| 1259 | endarg = argv; | 1259 | endarg = argv; |
| 1260 | while (1) { | 1260 | while (1) { |
| 1261 | if (!*++endarg) | 1261 | if (!*++endarg) |
| 1262 | bb_error_msg_and_die("unpaired '('"); | 1262 | bb_simple_error_msg_and_die("unpaired '('"); |
| 1263 | if (LONE_CHAR(*endarg, '(')) | 1263 | if (LONE_CHAR(*endarg, '(')) |
| 1264 | nested++; | 1264 | nested++; |
| 1265 | else if (LONE_CHAR(*endarg, ')') && !--nested) { | 1265 | else if (LONE_CHAR(*endarg, ')') && !--nested) { |