--- netpbm-10.29/editor/pamstretch-gen-	2004-07-25 00:01:24 +0000
+++ netpbm-10.29/editor/pamstretch-gen	2005-10-04 16:55:51 +0000
@@ -31,13 +31,17 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
-chmod 700 $tempdir
+exit_handler()
+{
+	local rc=$?
+	trap - EXIT
+	rm -rf -- "$tempdir"
+	exit $rc
+}
+tempdir=`mktemp -d -t pamstretchgen.XXXXXXXX` || exit 1
+trap exit_handler EXIT HUP INT QUIT PIPE TERM
 tempfile=$tempdir/pnmig
 
-trap 'rm -rf $tempdir' 0 1 3 15
-
 if ! cat $2 >$tempfile 2>/dev/null; then
   echo 'pamstretch-gen: error reading file' 1>&2
   exit 1