diff options
| author | Matheus Izvekov | 2010-04-26 13:53:57 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-04-26 13:53:57 +0200 |
| commit | 4640ccc39940a4842c62a9c1cf91f425b3f0bc99 (patch) | |
| tree | d4f2fc3ad433a9991dea04964a801628263e3ac0 | |
| parent | 9138817a27068073a565d915d10301ca00e79659 (diff) | |
| download | busybox-4640ccc39940a4842c62a9c1cf91f425b3f0bc99.zip busybox-4640ccc39940a4842c62a9c1cf91f425b3f0bc99.tar.gz | |
cpio: "NNN blocks" should go to stderr
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/cpio.c | 2 | ||||
| -rwxr-xr-x | testsuite/cpio.tests | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index 858e59b..2698f07 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) if (archive_handle->cpio__blocks != (off_t)-1 && !(opt & CPIO_OPT_QUIET) ) { - printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks); + fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks); } return EXIT_SUCCESS; diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests index e53ade92..325664d 100755 --- a/testsuite/cpio.tests +++ b/testsuite/cpio.tests @@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev/null # testing "test name" "command" "expected result" "file input" "stdin" testing "cpio extracts zero-sized hardlinks" \ -"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?; +"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?; ls -ln cpio.testdir | $FILTER_LS" \ "\ 1 blocks @@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \ test x"$SKIP_KNOWN_BUGS" = x"" && { # Currently fails. Numerous buglets: "1 blocks" versus "1 block", -# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y +# does not list cpio.testdir/x and cpio.testdir/y testing "cpio lists hardlinks" \ "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \ "\ @@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/nonempty1 mkdir cpio.testdir2 testing "cpio extracts zero-sized hardlinks 2" \ -"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?; +"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?; ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \ "\ 2 blocks @@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \ # Was trying to create "/usr/bin", correct is "usr/bin". rm -rf cpio.testdir testing "cpio -p with absolute paths" \ -"echo /usr/bin | cpio -dp cpio.testdir; echo \$?; +"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?; ls cpio.testdir" \ "\ 1 blocks |