diff options
author | Elliott Hughes <enh@google.com> | 2019-07-09 16:08:16 -0700 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2019-07-10 01:54:01 -0500 |
commit | 0d754b823cfd6b9a9ed8f072277b1b5bea6e44a4 (patch) | |
tree | ffbb4f13f1bf3d5763d7b49afd1a08e2b447bf99 /tests | |
parent | c3ccbbc4ff3352877ed39b6d4fa430affea0e9a4 (diff) | |
download | toybox-0d754b823cfd6b9a9ed8f072277b1b5bea6e44a4.tar.gz |
dd: iflags, oflags, fix ^C, fix the fundamental loop.
Investigating why the toybox tar tests fail on Android with toybox dd, I
realized I was rewriting a part of dd I'd rewritten before!
This is a re-send of my 2019-02-22 patch, rebased against the current
ToT...
This patch was originally motivated because after suggesting to the author of
https://stackoverflow.com/questions/17157820/access-vdsolinux/54797221#54797221
that he could tell dd to work in bytes rather than blocks, I realized
that our dd doesn't actually support that. But the rewrite of the main
loop is necessary to fix the incorrect output from the dd calls in the
tar test.
Without this patch, `yes | dd bs=65536 count=1 > fweep` basically gives
random output, based on how many bytes the pipe feels like giving you in
your first read. (As far as I know, dd *without* bs= was fine, but I
can't guarantee that that's true, just that I haven't seen it fail.)
Also switch to TAGGED_ARRAY and comma_* for conv rather than add two more
copies of an undesired idiom. It turned out -- contrary to the belief of
cp(1) -- that comma_scan isn't suitable for this because of its magic
handling of "no" prefixes. (It's actually harmless in cp because none
of the --preserve options begin with "no", but some dd options do.) To
this end, comma_remove is a less-magic comma_scan.
I've also changed an `if` to a `while` because other implementations
allow things like `--preserve=mode,mode` or `conv=sync,sync`. (If we
decide this is a bug rather than a feature, we should at least fix the
error message to be clear that we're rejecting the *duplication*, not
the option itself.)
I've also fixed the ^C behavior by simply adding a direct SIGINT handler
rather than trying to be clever inside the read loop (which is why we
weren't handling the SIGINT until the read returned).
I've also removed `strstarteq` and just added the '=' to each literal
when calling regular `strstart`.
Plus basic tests.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/cp.test | 3 | ||||
-rw-r--r-- | tests/dd.test | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/cp.test b/tests/cp.test index 6c798b4b..af59593a 100755 --- a/tests/cp.test +++ b/tests/cp.test @@ -111,6 +111,9 @@ testing "symlink dest permissions" "cp woot carpenter && stat -c %A carpenter" \ "-rw-r--r--\n" "" "" rm -rf walrus woot carpenter +# duplicated --preserve= options are fine. +testing "--preserve=mode,mode" "cp --preserve=mode,mode walrus walrus2" "" "" "" + # cp -r ../source destdir # cp -r one/two/three missing # cp -r one/two/three two diff --git a/tests/dd.test b/tests/dd.test index d2d6033e..7d7b794b 100644 --- a/tests/dd.test +++ b/tests/dd.test @@ -95,3 +95,15 @@ testing "status=none" "dd if=input status=none ibs=1 2>&1" "input\n" "input\n" " testing "seek stdout" "yes 2> /dev/null | dd bs=8 seek=2 count=1 > out 2> /dev/null && xxd -p out" \ "00000000000000000000000000000000790a790a790a790a\n" "" "" + +# Duplicated options are fine. +testing "conv=sync,sync" "dd conv=sync,sync $opt | head -n 1" "I WANT\n" "" "I WANT\n" + +# _bytes options +testing "iflag=count_bytes" \ + "dd if=input count=2 ibs=4096 iflag=count_bytes $opt" "hi" "high" "" +testing "iflag=skip_bytes" \ + "dd if=input skip=2 ibs=4096 iflag=skip_bytes $opt" "gh" "high" "" +testing "oflag=seek_bytes" \ + "dd if=input of=output seek=2 obs=4096 oflag=seek_bytes status=none && \ + xxd -p output" "000030313233\n" "0123" "" |