aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-08-30 08:37:51 +0100
committerRon Yorston <rmy@pobox.com>2021-08-30 08:37:51 +0100
commitbdb10f66af52bbd4f9d9340f2cf8ca73adbaee91 (patch)
tree306810231da90fb758cacb38ee9f8a7c4adf0d7c /findutils
parent6a42f73dcac55a6b5dde810ad60cee7c120a2db7 (diff)
parenta51d953b95a7cc6b40a6b3a5bfd95f3154acf5e2 (diff)
downloadbusybox-w32-bdb10f66af52bbd4f9d9340f2cf8ca73adbaee91.tar.gz
busybox-w32-bdb10f66af52bbd4f9d9340f2cf8ca73adbaee91.tar.bz2
busybox-w32-bdb10f66af52bbd4f9d9340f2cf8ca73adbaee91.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
-rw-r--r--findutils/grep.c2
-rw-r--r--findutils/xargs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index be4362ed0..8600d72fa 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -83,7 +83,7 @@
83//usage: "\n -F PATTERN is a literal (not regexp)" 83//usage: "\n -F PATTERN is a literal (not regexp)"
84//usage: "\n -E PATTERN is an extended regexp" 84//usage: "\n -E PATTERN is an extended regexp"
85//usage: IF_EXTRA_COMPAT( 85//usage: IF_EXTRA_COMPAT(
86//usage: "\n -z Input is NUL terminated" 86//usage: "\n -z NUL terminated input"
87//usage: ) 87//usage: )
88//usage: "\n -m N Match up to N times per file" 88//usage: "\n -m N Match up to N times per file"
89//usage: IF_FEATURE_GREP_CONTEXT( 89//usage: IF_FEATURE_GREP_CONTEXT(
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 1f8d95168..a0ba89c1e 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -623,7 +623,7 @@ static int xargs_ask_confirmation(void)
623//usage:#define xargs_full_usage "\n\n" 623//usage:#define xargs_full_usage "\n\n"
624//usage: "Run PROG on every item given by stdin\n" 624//usage: "Run PROG on every item given by stdin\n"
625//usage: IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( 625//usage: IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(
626//usage: "\n -0 Input is separated by NULs" 626//usage: "\n -0 NUL terminated input"
627//usage: ) 627//usage: )
628//usage: IF_FEATURE_XARGS_SUPPORT_ARGS_FILE( 628//usage: IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(
629//usage: "\n -a FILE Read from FILE instead of stdin" 629//usage: "\n -a FILE Read from FILE instead of stdin"