diff options
author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /findutils | |
parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
-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 f26c01c1e..188865e05 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -1445,7 +1445,7 @@ static action*** parse_params(char **argv) | |||
1445 | #else | 1445 | #else |
1446 | #define XATOU_SFX xatoul_sfx | 1446 | #define XATOU_SFX xatoul_sfx |
1447 | #endif | 1447 | #endif |
1448 | static const struct suffix_mult find_suffixes[] = { | 1448 | static const struct suffix_mult find_suffixes[] ALIGN_SUFFIX = { |
1449 | { "c", 1 }, | 1449 | { "c", 1 }, |
1450 | { "w", 2 }, | 1450 | { "w", 2 }, |
1451 | { "", 512 }, | 1451 | { "", 512 }, |
@@ -1526,7 +1526,7 @@ int find_main(int argc UNUSED_PARAM, char **argv) | |||
1526 | } | 1526 | } |
1527 | *past_HLP = NULL; | 1527 | *past_HLP = NULL; |
1528 | /* "+": stop on first non-option */ | 1528 | /* "+": stop on first non-option */ |
1529 | i = getopt32(argv, "+HLP"); | 1529 | i = getopt32(argv, "+""HLP"); |
1530 | if (i & (1<<0)) | 1530 | if (i & (1<<0)) |
1531 | G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK; | 1531 | G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK; |
1532 | if (i & (1<<1)) | 1532 | if (i & (1<<1)) |