diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
commit | 5f6f2162512106adf120d4b528bb125e93e34429 (patch) | |
tree | 7d7449f755633c263be7125ad58d21cc3ca5b8a7 /coreutils/dd.c | |
parent | 9db69882bee2d528d706d61d34ef7741122330be (diff) | |
parent | a116552869db5e7793ae10968eb3c962c69b3d8c (diff) | |
download | busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2 busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r-- | coreutils/dd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index c22a39da7..da205ec69 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -24,7 +24,7 @@ static const struct suffix_mult dd_suffixes[] = { | |||
24 | { "b", 512 }, | 24 | { "b", 512 }, |
25 | { "kD", 1000 }, | 25 | { "kD", 1000 }, |
26 | { "k", 1024 }, | 26 | { "k", 1024 }, |
27 | { "K", 1024 }, /* compat with coreutils dd */ | 27 | { "K", 1024 }, /* compat with coreutils dd */ |
28 | { "MD", 1000000 }, | 28 | { "MD", 1000000 }, |
29 | { "M", 1048576 }, | 29 | { "M", 1048576 }, |
30 | { "GD", 1000000000 }, | 30 | { "GD", 1000000000 }, |