Merge tag '3'

1 files changed, 27 insertions, 24 deletions

diff --git a/2ff b/2ff
index f958692..10e4320 100755
--- a/2ff
+++ b/2ff
@@ -1,41 +1,44 @@
 #!/bin/sh
+
+# arguments
 if [ "$#" -ne 0 ]; then
 	echo "usage: $0" >&2
 	exit 1
 fi
 
+# write input into temporary file
 TMP=$(mktemp)
 trap 'rm "$TMP"' EXIT
-
 cat > "$TMP"
 
-if [ "$(dd if="$TMP" bs=1 count=8 2>/dev/null)" = "farbfeld" ]; then
+# determine the mime-type
+if [ "$(dd if="$TMP" bs=1 count=8 2>/dev/null | tr -d '\0')" = "farbfeld" ]; then
 	cat "$TMP"
-	exit 0
-fi
+else
+	MIME=$(file -ib "$TMP" | cut -d ";" -f 1)
 
-FORMAT=$(file -ib "$TMP" | cut -d ";" -f 1)
+	case "$MIME" in
+	image/png)
+		png2ff < "$TMP"
+		;;
+	image/jpeg)
+		jpg2ff < "$TMP"
+		;;
+	*)
+		if [ ! -x /usr/bin/convert ] ; then
+			printf "%s: cant convert from %s -- missing \`convert' program" "$0" "$FORMAT" >&2
+			printf "Run \`apt-get install imagemagick' to install it" >&2
+			exit 1
+		fi
 
-case "$FORMAT" in
-image/png)
-	png2ff < "$TMP"
-	;;
-image/jpeg)
-	jpg2ff < "$TMP"
-	;;
-*)
-	if [ ! -x /usr/bin/convert ] ; then
-		printf "%s: cant convert from %s -- missing \`convert' program" "$0" "$FORMAT" >&2
-		printf "Run \`apt-get install imagemagick' to install it" >&2
-		exit 1
-	fi
-	convert "$TMP" png:- 2>/dev/null | png2ff 2>/dev/null
-	;;
-esac
+		convert "$TMP" png:- | png2ff
+		;;
+	esac
+fi
 
+# errors
 if [ $? -ne 0 ]; then
-	printf "%s: failed to convert from %s\n" "$0" "$FORMAT" >&2
 	exit 1
+else
+	exit 0
 fi
-
-exit 0