summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-25 14:46:21 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-25 14:46:21 +0000
commit5dd27b1ee0518f4f886e6140adc5d1f20fb770e2 (patch)
tree546e4315d96ed4dc0610ef8c7c75ed4397b20f64
parented836cdc30642ddbecc286b279d461ca44135cbb (diff)
downloadbusybox-w32-5dd27b1ee0518f4f886e6140adc5d1f20fb770e2.tar.gz
busybox-w32-5dd27b1ee0518f4f886e6140adc5d1f20fb770e2.tar.bz2
busybox-w32-5dd27b1ee0518f4f886e6140adc5d1f20fb770e2.zip
dd: support >2gb values for seek, skip, count
-rw-r--r--coreutils/dd.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 96ea32f06..01702a580 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -44,6 +44,12 @@ static ssize_t full_write_or_warn(int fd, const void *buf, size_t len,
44 return n; 44 return n;
45} 45}
46 46
47#if ENABLE_LFS
48#define XATOU_SFX xatoull_sfx
49#else
50#define XATOU_SFX xatoul_sfx
51#endif
52
47int dd_main(int argc, char **argv) 53int dd_main(int argc, char **argv)
48{ 54{
49 enum { 55 enum {
@@ -79,13 +85,13 @@ int dd_main(int argc, char **argv)
79 obs = xatoul_range_sfx(arg+4, 0, ((size_t)-1L)/2, dd_suffixes); 85 obs = xatoul_range_sfx(arg+4, 0, ((size_t)-1L)/2, dd_suffixes);
80 else if (!strncmp("bs=", arg, 3)) 86 else if (!strncmp("bs=", arg, 3))
81 ibs = obs = xatoul_range_sfx(arg+3, 0, ((size_t)-1L)/2, dd_suffixes); 87 ibs = obs = xatoul_range_sfx(arg+3, 0, ((size_t)-1L)/2, dd_suffixes);
82 // FIXME: make them capable of eating LARGE numbers 88 /* These can be large: */
83 else if (!strncmp("count=", arg, 6)) 89 else if (!strncmp("count=", arg, 6))
84 count = xatoul_sfx(arg+6, dd_suffixes); 90 count = XATOU_SFX(arg+6, dd_suffixes);
85 else if (!strncmp("seek=", arg, 5)) 91 else if (!strncmp("seek=", arg, 5))
86 seek = xatoul_sfx(arg+5, dd_suffixes); 92 seek = XATOU_SFX(arg+5, dd_suffixes);
87 else if (!strncmp("skip=", arg, 5)) 93 else if (!strncmp("skip=", arg, 5))
88 skip = xatoul_sfx(arg+5, dd_suffixes); 94 skip = XATOU_SFX(arg+5, dd_suffixes);
89 95
90 else if (!strncmp("if=", arg, 3)) 96 else if (!strncmp("if=", arg, 3))
91 infile = arg+3; 97 infile = arg+3;