diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
commit | 8afe8ee83a274925340473fa4d0a984bdcbee740 (patch) | |
tree | b78ed448cb6a55ba7d0ef8141a9f68b55b8acf11 /findutils | |
parent | caab029609633220c417dc0aaa9025fd4b7a169c (diff) | |
parent | 3d0805e9e7c45e6c0f9fb5e587d8b4a5a5f3c74c (diff) | |
download | busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.gz busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.bz2 busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/find.c | 6 | ||||
-rw-r--r-- | findutils/grep.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/findutils/find.c b/findutils/find.c index bd7ccc323..a0d4853de 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -423,9 +423,7 @@ struct globals { | |||
423 | } FIX_ALIASING; | 423 | } FIX_ALIASING; |
424 | #define G (*(struct globals*)&bb_common_bufsiz1) | 424 | #define G (*(struct globals*)&bb_common_bufsiz1) |
425 | #define INIT_G() do { \ | 425 | #define INIT_G() do { \ |
426 | struct G_sizecheck { \ | 426 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ |
427 | char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ | ||
428 | }; \ | ||
429 | /* we have to zero it out because of NOEXEC */ \ | 427 | /* we have to zero it out because of NOEXEC */ \ |
430 | memset(&G, 0, sizeof(G)); \ | 428 | memset(&G, 0, sizeof(G)); \ |
431 | IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \ | 429 | IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \ |
@@ -884,7 +882,7 @@ static int find_type(const char *type) | |||
884 | mask = S_IFSOCK; | 882 | mask = S_IFSOCK; |
885 | 883 | ||
886 | if (mask == 0 || type[1] != '\0') | 884 | if (mask == 0 || type[1] != '\0') |
887 | bb_error_msg_and_die(bb_msg_invalid_arg, type, "-type"); | 885 | bb_error_msg_and_die(bb_msg_invalid_arg_to, type, "-type"); |
888 | 886 | ||
889 | return mask; | 887 | return mask; |
890 | } | 888 | } |
diff --git a/findutils/grep.c b/findutils/grep.c index 0336b2927..e163e6562 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -211,9 +211,7 @@ struct globals { | |||
211 | } FIX_ALIASING; | 211 | } FIX_ALIASING; |
212 | #define G (*(struct globals*)&bb_common_bufsiz1) | 212 | #define G (*(struct globals*)&bb_common_bufsiz1) |
213 | #define INIT_G() do { \ | 213 | #define INIT_G() do { \ |
214 | struct G_sizecheck { \ | 214 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ |
215 | char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ | ||
216 | }; \ | ||
217 | } while (0) | 215 | } while (0) |
218 | #define max_matches (G.max_matches ) | 216 | #define max_matches (G.max_matches ) |
219 | #if !ENABLE_EXTRA_COMPAT | 217 | #if !ENABLE_EXTRA_COMPAT |