Improved speed of unsquashfs_all significantly.

git-svn-id: http://firmware-mod-kit.googlecode.com/svn/trunk@374 5c1471b0-2a1b-0410-b4f4-f33460ac40b9

uncpio.sh

@@ -26,7 +26,7 @@ fi
 
 cd $ROOTFS && cpio -i --no-absolute-filenames < $FSIMG
 
-if [ "$?" != "0" ] && [ "$ROOTFS_CREATED" == "1" ]
+if [ "$(ls $ROOTFS)" == "" ] && [ "$ROOTFS_CREATED" == "1" ]
 then
 	rm -rf $ROOTFS
 fi

unsquashfs_all.sh

@@ -33,6 +33,29 @@ TIMEOUT="15"
 MKFS=""
 DEST=""
 
+function wait_for_complete()
+{
+	I=0
+	PNAME="$1"
+
+	while [ $I -lt $TIMEOUT ]
+	do
+		sleep 1
+
+		if [ "$(pgrep $PNAME)" == "" ]
+		then
+			break
+		fi
+
+		((I=$I+1))
+	done
+
+	if [ "$I" == "$TIMEOUT" ]
+	then
+		kill -9 $(pgrep $PNAME) 2>/dev/null
+	fi
+}
+
 if [ "$IMG" == "" ] || [ "$IMG" == "-h" ]
 then
 	echo "Usage: $0 <squashfs image> [output directory]"
@@ -60,7 +83,6 @@ cd $(dirname $(readlink -f $0))
 
 DEST="-dest $DIR"
 MAJOR=$(./src/binwalk -m ./src/binwalk-*/src/magic.binwalk -l 1 "$IMG" | head -4 | tail -1 | sed -e 's/.*version //' | cut -d'.' -f1)
-#./src/binwalk -m ./src/binwalk-*/src/magic.binwalk -l 1 "$IMG" | head -4 | tail -1
 
 echo -e "Attempting to extract SquashFS $MAJOR.X file system...\n"
 
@@ -80,16 +102,17 @@ do
 		echo -ne "\nTrying $unsquashfs... "
 
 		$unsquashfs $DEST $IMG 2>/dev/null &
-		sleep $TIMEOUT && kill $! 1>&2 >/dev/null
+		#sleep $TIMEOUT && kill $! 1>&2 >/dev/null
+		wait_for_complete $unsquashfs
 
 		if [ -d "$DIR" ]
 		then
 			if [ "$(ls $DIR)" != "" ]
 			then
 				# Most systems will have busybox - make sure it's a non-zero file size
-				if [ -e "$DIR/bin/busybox" ]
+				if [ -e "$DIR/bin/sh" ]
 				then
-					if [ "$(wc -c $DIR/bin/busybox | cut -d' ' -f1)" != "0" ]
+					if [ "$(wc -c $DIR/bin/sh | cut -d' ' -f1)" != "0" ]
 					then
 						MKFS="$mksquashfs"
 					fi
@@ -110,16 +133,17 @@ do
 		echo -ne "\nTrying $unsquashfs-lzma... "
 
 		$unsquashfs-lzma $DEST $IMG 2>/dev/null &
-		sleep $TIMEOUT && kill $! 1>&2 >/dev/null
+		#sleep $TIMEOUT && kill $! 1>&2 >/dev/null
+		wait_for_complete $unsquashfs-lzma
 
 		if [ -d "$DIR" ]
                 then
 			if [ "$(ls $DIR)" != "" ]
 			then
 				# Most systems will have busybox - make sure it's a non-zero file size
-				if [ -e "$DIR/bin/busybox" ]
+				if [ -e "$DIR/bin/sh" ]
 				then
-					if [ "$(wc -c $DIR/bin/busybox | cut -d' ' -f1)" != "0" ]
+					if [ "$(wc -c $DIR/bin/sh | cut -d' ' -f1)" != "0" ]
 					then
 						MKFS="$mksquashfs-lzma"
 					fi