From 8d127abe871abee437921084bb34a4eac9cfd381 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 22 Aug 2021 04:03:46 -0500
Subject: [PATCH] Copy data being checksummed to "save.dat" for post-failure
 analysis.

---
 tests/tar.test | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/tar.test b/tests/tar.test
index 70668c9c..0406fa9a 100644
--- a/tests/tar.test
+++ b/tests/tar.test
@@ -19,21 +19,11 @@ LONG=${LONG:1:255}
 # Reproducible tarballs: override ownership and timestamp.
 TAR='tar c --owner root --group root --mtime @1234567890'
 
-# Also amount of trailing NUL padding varies (1024 bytes is minimum,
-# gnu/dammit does more) so look at first N 512-byte frames when
-# analyzing header content.
+# Different tars add variable trailing NUL padding (1024 bytes is just minimum)
+# so look at first N 512-byte frames when analyzing header content.
 function SUM()
 {
-  if [ -n "$TARHD" ]; then
-    # (Android's shell doesn't support process substitution.)
-    mkfifo xxd-pipe
-    xxd <xxd-pipe & pid=$!
-    tee xxd-pipe | head -c $(($1*512)) | sha1sum | sed "s/ .*//"
-    rm xxd-pipe
-    wait $pid
-  else
-    head -c $(($1*512)) | sha1sum | sed "s/ .*//"
-  fi
+  tee save.dat | head -c $(($1*512)) | sha1sum | sed "s/ .*//"
 }
 
 function LST()
@@ -327,3 +317,4 @@ TZ="$OLDTZ"
 umask $OLDUMASK
 unset LONG TAR SUM OLDUMASK OLDTZ
 unset -f LST
+rm save.dat
-- 
2.39.2