--- sh.common.orig	2004-04-07 08:50:21.000000000 +0100
+++ sh.common	2005-05-29 20:39:20.854878600 +0100
@@ -168,7 +168,13 @@
     else
         tmpdir="/tmp"
     fi
-    tmpfile="$tmpdir/.shtool.$$"
+    if mkdir "$tmpdir/.shtool.$$"; then
+        tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
+	else
+        echo "$msgprefix:Error: failed to create temporary file" 1>&2
+        exit 1
+    fi
+    tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
     rm -f $tmpfile >/dev/null 2>&1
     touch $tmpfile
     chmod 600 $tmpfile
@@ -188,7 +194,7 @@
 shtool_exit () {
     rc="$1"
     if [ ".$gen_tmpfile" = .yes ]; then
-        rm -f $tmpfile >/dev/null 2>&1 || true
+        rm -fr "$tmpdir/.shtool.$$" >/dev/null 2>&1 || true
     fi
     exit $rc
 }