emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio: "NNN blocks" should go to stderr

Browse Source 
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Matheus Izvekov
2010-04-26 13:53:57 +02:00
committed by Denys Vlasenko
parent 9138817a27
commit 4640ccc399
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archival/cpio.c
View File

@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
if (archive_handle->cpio__blocks != (off_t)-1 if (archive_handle->cpio__blocks != (off_t)-1
&& !(opt & CPIO_OPT_QUIET) && !(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; return EXIT_SUCCESS;

8
testsuite/cpio.tests
View File

@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev/null
# testing "test name" "command" "expected result" "file input" "stdin" # testing "test name" "command" "expected result" "file input" "stdin"
testing "cpio extracts zero-sized hardlinks" \ 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" \ ls -ln cpio.testdir | $FILTER_LS" \
"\ "\
1 blocks 1 blocks
@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
test x"$SKIP_KNOWN_BUGS" = x"" && { test x"$SKIP_KNOWN_BUGS" = x"" && {
# Currently fails. Numerous buglets: "1 blocks" versus "1 block", # 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" \ testing "cpio lists hardlinks" \
"$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \ "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
"\ "\
@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/nonempty1
mkdir cpio.testdir2 mkdir cpio.testdir2
testing "cpio extracts zero-sized hardlinks 2" \ 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" \ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
"\ "\
2 blocks 2 blocks
@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
# Was trying to create "/usr/bin", correct is "usr/bin". # Was trying to create "/usr/bin", correct is "usr/bin".
rm -rf cpio.testdir rm -rf cpio.testdir
testing "cpio -p with absolute paths" \ 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" \ ls cpio.testdir" \
"\ "\
1 blocks 1 blocks