package/busybox/patches/000-upstream-cpio.patch

   1 --- a/archival/cpio.c
   2 +++ b/archival/cpio.c
   3 @@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
   4         if (archive_handle->cpio__blocks != (off_t)-1
   5          && !(opt & CPIO_OPT_QUIET)
   6         ) {
   7 -               printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
   8 +               fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
   9         }
  10
  11         return EXIT_SUCCESS;
  12 --- a/testsuite/cpio.tests
  13 +++ b/testsuite/cpio.tests
  14 @@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
  15  # testing "test name" "command" "expected result" "file input" "stdin"
  16
  17  testing "cpio extracts zero-sized hardlinks" \
  18 -"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
  19 +"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
  20  ls -ln cpio.testdir | $FILTER_LS" \
  21  "\
  22  1 blocks
  23 @@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
  24
  25  test x"$SKIP_KNOWN_BUGS" = x"" && {
  26  # Currently fails. Numerous buglets: "1 blocks" versus "1 block",
  27 -# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
  28 +# does not list cpio.testdir/x and cpio.testdir/y
  29  testing "cpio lists hardlinks" \
  30  "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
  31  "\
  32 @@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
  33  mkdir cpio.testdir2
  34
  35  testing "cpio extracts zero-sized hardlinks 2" \
  36 -"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
  37 +"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
  38  ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
  39  "\
  40  2 blocks
  41 @@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
  42  # Was trying to create "/usr/bin", correct is "usr/bin".
  43  rm -rf cpio.testdir
  44  testing "cpio -p with absolute paths" \
  45 -"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
  46 +"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
  47  ls cpio.testdir" \
  48  "\
  49  1 blocks