diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 18:17:42 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-26 18:17:42 +0000 |
commit | 666da5e2c6edec979966d16771818b32dcfafe04 (patch) | |
tree | c23e6a01fc51d8419c1562f70836148c705ac46a /findutils/find.c | |
parent | 270c17c0e66ffe9fe0e47e891a583b5c6f8512ef (diff) | |
download | busybox-w32-666da5e2c6edec979966d16771818b32dcfafe04.tar.gz busybox-w32-666da5e2c6edec979966d16771818b32dcfafe04.tar.bz2 busybox-w32-666da5e2c6edec979966d16771818b32dcfafe04.zip |
merge post-1.3.0 fixes
Diffstat (limited to 'findutils/find.c')
-rw-r--r-- | findutils/find.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/findutils/find.c b/findutils/find.c index fffa3cd5c..2f94d13e7 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -76,6 +76,7 @@ static action ***actions; | |||
76 | static int need_print = 1; | 76 | static int need_print = 1; |
77 | 77 | ||
78 | 78 | ||
79 | #if ENABLE_FEATURE_FIND_EXEC | ||
79 | static int count_subst(const char *str) | 80 | static int count_subst(const char *str) |
80 | { | 81 | { |
81 | int count = 0; | 82 | int count = 0; |
@@ -103,6 +104,7 @@ static char* subst(const char *src, int count, const char* filename) | |||
103 | strcpy(dst, src); | 104 | strcpy(dst, src); |
104 | return buf; | 105 | return buf; |
105 | } | 106 | } |
107 | #endif | ||
106 | 108 | ||
107 | 109 | ||
108 | static int exec_actions(action ***appp, const char *fileName, struct stat *statbuf) | 110 | static int exec_actions(action ***appp, const char *fileName, struct stat *statbuf) |
@@ -556,8 +558,8 @@ int find_main(int argc, char **argv) | |||
556 | argp[0] = "-a"; | 558 | argp[0] = "-a"; |
557 | } | 559 | } |
558 | argp++; | 560 | argp++; |
559 | } | ||
560 | #endif | 561 | #endif |
562 | } | ||
561 | 563 | ||
562 | actions = parse_params(&argv[firstopt]); | 564 | actions = parse_params(&argv[firstopt]); |
563 | 565 | ||