diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:47:25 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:47:25 +1000 |
commit | 9df56f96fd9a213189ca94c1fccfc3c42bd9c16a (patch) | |
tree | db1db005b59e2b78d5daf9527fa8fc604e07e8c4 /findutils | |
parent | 30c62e541a1484fedc3d689d62f96d246a28b147 (diff) | |
parent | 5f3303712ef483d270097cae4ba0a559b1056121 (diff) | |
download | busybox-w32-9df56f96fd9a213189ca94c1fccfc3c42bd9c16a.tar.gz busybox-w32-9df56f96fd9a213189ca94c1fccfc3c42bd9c16a.tar.bz2 busybox-w32-9df56f96fd9a213189ca94c1fccfc3c42bd9c16a.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/find.c | 6 | ||||
-rw-r--r-- | findutils/grep.c | 2 | ||||
-rw-r--r-- | findutils/xargs.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/findutils/find.c b/findutils/find.c index 9022867a2..ca630b6c5 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -57,7 +57,7 @@ | |||
57 | //config: | 57 | //config: |
58 | //config:config FIND | 58 | //config:config FIND |
59 | //config: bool "find" | 59 | //config: bool "find" |
60 | //config: default n | 60 | //config: default y |
61 | //config: help | 61 | //config: help |
62 | //config: find is used to search your system to find specified files. | 62 | //config: find is used to search your system to find specified files. |
63 | //config: | 63 | //config: |
@@ -193,7 +193,7 @@ | |||
193 | //config: | 193 | //config: |
194 | //config:config FEATURE_FIND_DELETE | 194 | //config:config FEATURE_FIND_DELETE |
195 | //config: bool "Enable -delete: delete files/dirs" | 195 | //config: bool "Enable -delete: delete files/dirs" |
196 | //config: default n | 196 | //config: default y |
197 | //config: depends on FIND && FEATURE_FIND_DEPTH | 197 | //config: depends on FIND && FEATURE_FIND_DEPTH |
198 | //config: help | 198 | //config: help |
199 | //config: Support the 'find -delete' option for deleting files and directories. | 199 | //config: Support the 'find -delete' option for deleting files and directories. |
@@ -223,7 +223,7 @@ | |||
223 | //config: | 223 | //config: |
224 | //config:config FEATURE_FIND_LINKS | 224 | //config:config FEATURE_FIND_LINKS |
225 | //config: bool "Enable -links: link count matching" | 225 | //config: bool "Enable -links: link count matching" |
226 | //config: default n | 226 | //config: default y |
227 | //config: depends on FIND | 227 | //config: depends on FIND |
228 | //config: help | 228 | //config: help |
229 | //config: Support the 'find -links' option for matching number of links. | 229 | //config: Support the 'find -links' option for matching number of links. |
diff --git a/findutils/grep.c b/findutils/grep.c index d5fe10320..fedf12d8a 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -23,7 +23,7 @@ | |||
23 | //config: | 23 | //config: |
24 | //config:config GREP | 24 | //config:config GREP |
25 | //config: bool "grep" | 25 | //config: bool "grep" |
26 | //config: default n | 26 | //config: default y |
27 | //config: help | 27 | //config: help |
28 | //config: grep is used to search files for a specified pattern. | 28 | //config: grep is used to search files for a specified pattern. |
29 | //config: | 29 | //config: |
diff --git a/findutils/xargs.c b/findutils/xargs.c index c55ac5724..7db374c4a 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
@@ -21,14 +21,14 @@ | |||
21 | //config: | 21 | //config: |
22 | //config:config XARGS | 22 | //config:config XARGS |
23 | //config: bool "xargs" | 23 | //config: bool "xargs" |
24 | //config: default n | 24 | //config: default y |
25 | //config: help | 25 | //config: help |
26 | //config: xargs is used to execute a specified command for | 26 | //config: xargs is used to execute a specified command for |
27 | //config: every item from standard input. | 27 | //config: every item from standard input. |
28 | //config: | 28 | //config: |
29 | //config:config FEATURE_XARGS_SUPPORT_CONFIRMATION | 29 | //config:config FEATURE_XARGS_SUPPORT_CONFIRMATION |
30 | //config: bool "Enable -p: prompt and confirmation" | 30 | //config: bool "Enable -p: prompt and confirmation" |
31 | //config: default n | 31 | //config: default y |
32 | //config: depends on XARGS | 32 | //config: depends on XARGS |
33 | //config: help | 33 | //config: help |
34 | //config: Support -p: prompt the user whether to run each command | 34 | //config: Support -p: prompt the user whether to run each command |
@@ -36,14 +36,14 @@ | |||
36 | //config: | 36 | //config: |
37 | //config:config FEATURE_XARGS_SUPPORT_QUOTES | 37 | //config:config FEATURE_XARGS_SUPPORT_QUOTES |
38 | //config: bool "Enable single and double quotes and backslash" | 38 | //config: bool "Enable single and double quotes and backslash" |
39 | //config: default n | 39 | //config: default y |
40 | //config: depends on XARGS | 40 | //config: depends on XARGS |
41 | //config: help | 41 | //config: help |
42 | //config: Support quoting in the input. | 42 | //config: Support quoting in the input. |
43 | //config: | 43 | //config: |
44 | //config:config FEATURE_XARGS_SUPPORT_TERMOPT | 44 | //config:config FEATURE_XARGS_SUPPORT_TERMOPT |
45 | //config: bool "Enable -x: exit if -s or -n is exceeded" | 45 | //config: bool "Enable -x: exit if -s or -n is exceeded" |
46 | //config: default n | 46 | //config: default y |
47 | //config: depends on XARGS | 47 | //config: depends on XARGS |
48 | //config: help | 48 | //config: help |
49 | //config: Support -x: exit if the command size (see the -s or -n option) | 49 | //config: Support -x: exit if the command size (see the -s or -n option) |
@@ -51,7 +51,7 @@ | |||
51 | //config: | 51 | //config: |
52 | //config:config FEATURE_XARGS_SUPPORT_ZERO_TERM | 52 | //config:config FEATURE_XARGS_SUPPORT_ZERO_TERM |
53 | //config: bool "Enable -0: NUL-terminated input" | 53 | //config: bool "Enable -0: NUL-terminated input" |
54 | //config: default n | 54 | //config: default y |
55 | //config: depends on XARGS | 55 | //config: depends on XARGS |
56 | //config: help | 56 | //config: help |
57 | //config: Support -0: input items are terminated by a NUL character | 57 | //config: Support -0: input items are terminated by a NUL character |