aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-05-29 14:20:10 +0100
committerRon Yorston <rmy@pobox.com>2017-05-29 14:34:28 +0100
commitda4f331955bed8afda670afcd58d524a04a0faa9 (patch)
treef6a3879aefdd714240f8c022375f687b512d2238 /findutils
parent74163a535fd21f5fcca4c052d2e7c192d3e264fa (diff)
parent6683d1cbb44859f549f87f882545b84b9369585c (diff)
downloadbusybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.tar.gz
busybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.tar.bz2
busybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
-rw-r--r--findutils/find.c2
-rw-r--r--findutils/grep.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/findutils/find.c b/findutils/find.c
index 67aa40b21..0596c0059 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -182,7 +182,7 @@
182//config: default y 182//config: default y
183//config: depends on FIND 183//config: depends on FIND
184//config: help 184//config: help
185//config: If the file is a directory, dont descend into it. Useful for 185//config: If the file is a directory, don't descend into it. Useful for
186//config: exclusion .svn and CVS directories. 186//config: exclusion .svn and CVS directories.
187//config: 187//config:
188//config:config FEATURE_FIND_DELETE 188//config:config FEATURE_FIND_DELETE
diff --git a/findutils/grep.c b/findutils/grep.c
index 8b6e29874..b115d9a1d 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -39,7 +39,7 @@
39//config:config FEATURE_GREP_CONTEXT 39//config:config FEATURE_GREP_CONTEXT
40//config: bool "Enable before and after context flags (-A, -B and -C)" 40//config: bool "Enable before and after context flags (-A, -B and -C)"
41//config: default y 41//config: default y
42//config: depends on GREP || EGREP 42//config: depends on GREP || EGREP || FGREP
43//config: help 43//config: help
44//config: Print the specified number of leading (-B) and/or trailing (-A) 44//config: Print the specified number of leading (-B) and/or trailing (-A)
45//config: context surrounding our matching lines. 45//config: context surrounding our matching lines.
@@ -523,7 +523,7 @@ static int grep_file(FILE *file)
523 if (option_mask32 & OPT_o) { 523 if (option_mask32 & OPT_o) {
524 if (FGREP_FLAG) { 524 if (FGREP_FLAG) {
525 /* -Fo just prints the pattern 525 /* -Fo just prints the pattern
526 * (unless -v: -Fov doesnt print anything at all) */ 526 * (unless -v: -Fov doesn't print anything at all) */
527 if (found) 527 if (found)
528 print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); 528 print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
529 } else while (1) { 529 } else while (1) {
@@ -831,7 +831,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
831 grep_done: ; 831 grep_done: ;
832 } while (*argv && *++argv); 832 } while (*argv && *++argv);
833 833
834 /* destroy all the elments in the pattern list */ 834 /* destroy all the elements in the pattern list */
835 if (ENABLE_FEATURE_CLEAN_UP) { 835 if (ENABLE_FEATURE_CLEAN_UP) {
836 while (pattern_head) { 836 while (pattern_head) {
837 llist_t *pattern_head_ptr = pattern_head; 837 llist_t *pattern_head_ptr = pattern_head;