2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index acf5d88a..86cf356c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-18  Eugene Teo  <eteo@redhat.com>
+
+	PR 1341
+	* main.cxx (main): Use TMPDIR instead of hard-coded /tmp.
+
 2006-04-17  Frank Ch. Eigler  <fche@elastic.org>
 
 	* tapsets.cxx (mark_derived_probe::emit_{de}registrations):
diff --git a/main.cxx b/main.cxx
index 437ff722..8005a7ec 100644
--- a/main.cxx
+++ b/main.cxx
@@ -275,14 +275,18 @@ main (int argc, char * const argv [])
   // Create a temporary directory to build within.
   // Be careful with this, as "s.tmpdir" is "rm -rf"'d at the end.
   {
-    char tmpdirt[] = "/tmp/stapXXXXXX";
-    const char* tmpdir = mkdtemp (tmpdirt);
+    char* tmpdir_env = getenv("TMPDIR");
+    if (! tmpdir_env)
+      tmpdir_env = "/tmp";
+    
+    string stapdir = "/stapXXXXXX";
+    string tmpdirt = tmpdir_env + stapdir;
+    const char* tmpdir = mkdtemp((char *)tmpdirt.c_str());
     if (! tmpdir)
       {
         const char* e = strerror (errno);
-        cerr << "mkdtemp (\"" << tmpdir << "\"): " << e << endl;
-        s.tmpdir = "";
-        rc = 1;
+        cerr << "ERROR: cannot create temporary directory (\"" << tmpdirt << "\"): " << e << endl;
+        exit (1); // die
       }
     else
       s.tmpdir = tmpdir;