diff options
author | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
commit | 373275a708bafb88fa4f0519de2166154f44fed9 (patch) | |
tree | 4587b4fd3f695e0f3705b2a217e199f3144df931 /coreutils/dd.c | |
parent | b74b2619779b1deb903b7766261807df1e9b1f7f (diff) | |
parent | c2b18583a3df06aeecf535c3cea6856aa1f2e205 (diff) | |
download | busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.gz busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.bz2 busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r-- | coreutils/dd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index 8c144cfd2..85152d8ce 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -41,7 +41,7 @@ | |||
41 | //config: default y | 41 | //config: default y |
42 | //config: depends on DD | 42 | //config: depends on DD |
43 | //config: help | 43 | //config: help |
44 | //config: Enables support for writing a certain number of bytes in and out, | 44 | //config: Enable support for writing a certain number of bytes in and out, |
45 | //config: at a time, and performing conversions on the data stream. | 45 | //config: at a time, and performing conversions on the data stream. |
46 | //config: | 46 | //config: |
47 | //config:config FEATURE_DD_STATUS | 47 | //config:config FEATURE_DD_STATUS |
@@ -49,7 +49,7 @@ | |||
49 | //config: default y | 49 | //config: default y |
50 | //config: depends on DD | 50 | //config: depends on DD |
51 | //config: help | 51 | //config: help |
52 | //config: Enables support for status=noxfer/none option. | 52 | //config: Enable support for status=noxfer/none option. |
53 | 53 | ||
54 | //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) | 54 | //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) |
55 | 55 | ||