diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /findutils | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 8600d72fa..0b72812f1 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -470,7 +470,7 @@ static int grep_file(FILE *file) | |||
| 470 | * "exit immediately with zero status | 470 | * "exit immediately with zero status |
| 471 | * if any match is found, | 471 | * if any match is found, |
| 472 | * even if errors were detected" */ | 472 | * even if errors were detected" */ |
| 473 | exit(EXIT_SUCCESS); | 473 | exit_SUCCESS(); |
| 474 | } | 474 | } |
| 475 | /* -l "print filenames with matches": stop after the first match */ | 475 | /* -l "print filenames with matches": stop after the first match */ |
| 476 | if (option_mask32 & OPT_l) { | 476 | if (option_mask32 & OPT_l) { |