aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/cpio.c2
-rwxr-xr-xtestsuite/cpio.tests8
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 858e59b30..2698f0791 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
424 if (archive_handle->cpio__blocks != (off_t)-1 424 if (archive_handle->cpio__blocks != (off_t)-1
425 && !(opt & CPIO_OPT_QUIET) 425 && !(opt & CPIO_OPT_QUIET)
426 ) { 426 ) {
427 printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks); 427 fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
428 } 428 }
429 429
430 return EXIT_SUCCESS; 430 return EXIT_SUCCESS;
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index e53ade925..325664d71 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev/null
32# testing "test name" "command" "expected result" "file input" "stdin" 32# testing "test name" "command" "expected result" "file input" "stdin"
33 33
34testing "cpio extracts zero-sized hardlinks" \ 34testing "cpio extracts zero-sized hardlinks" \
35"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?; 35"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
36ls -ln cpio.testdir | $FILTER_LS" \ 36ls -ln cpio.testdir | $FILTER_LS" \
37"\ 37"\
381 blocks 381 blocks
@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
45 45
46test x"$SKIP_KNOWN_BUGS" = x"" && { 46test x"$SKIP_KNOWN_BUGS" = x"" && {
47# Currently fails. Numerous buglets: "1 blocks" versus "1 block", 47# Currently fails. Numerous buglets: "1 blocks" versus "1 block",
48# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y 48# does not list cpio.testdir/x and cpio.testdir/y
49testing "cpio lists hardlinks" \ 49testing "cpio lists hardlinks" \
50"$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \ 50"$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
51"\ 51"\
@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/nonempty1
70mkdir cpio.testdir2 70mkdir cpio.testdir2
71 71
72testing "cpio extracts zero-sized hardlinks 2" \ 72testing "cpio extracts zero-sized hardlinks 2" \
73"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?; 73"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
74ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \ 74ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
75"\ 75"\
762 blocks 762 blocks
@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
87# Was trying to create "/usr/bin", correct is "usr/bin". 87# Was trying to create "/usr/bin", correct is "usr/bin".
88rm -rf cpio.testdir 88rm -rf cpio.testdir
89testing "cpio -p with absolute paths" \ 89testing "cpio -p with absolute paths" \
90"echo /usr/bin | cpio -dp cpio.testdir; echo \$?; 90"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
91ls cpio.testdir" \ 91ls cpio.testdir" \
92"\ 92"\
931 blocks 931 blocks