Ticket #4381: porttrace_envTMPDIR.patch

src/port1.0/porttrace.tcl

@@ -164 +164 @@
 # Private.
 # Slave method to read a line from the trace.
 proc slave_read_line {chan} {
-        global ports_list trace_filemap created_list workpath trace_mutex own_mutex
+        global ports_list trace_filemap created_list workpath trace_mutex own_mutex envtmpdir
 
         # Acquire the mutex.
         thread::mutex lock $trace_mutex
@@ -219 +219 @@
                                         }
                                 }
                         } elseif {$op == "create"} {
-                                # Only keep entries not under workpath, under /tmp/, under
+                                # Only keep entries not under workpath, ignore entries under ENV{TMPDIR}, /tmp/, under
                                 # /var/tmp/ and /dev/null
                                 if {![string equal -length [string length "/tmp/"] "/tmp/" $path]
+                                        && !([info exists envtmpdir] && [string equal -length [string length "$envtmpdir"] "$envtmpdir" $path])
                                         && ![string equal -length [string length "/var/tmp/"] "/var/tmp/" $path]
                                         && ![string equal "/dev/null" $path]
                                         && ![string equal -length [string length $workpath] $workpath $path]} {
@@ -238 +239 @@
 # Slave init method.
 proc slave_start {fifo p_workpath mutex} {
         global ports_list trace_filemap created_list trace_fifo_r_chan \
-                trace_fifo_w_chan workpath trace_mutex own_mutex
+                trace_fifo_w_chan workpath trace_mutex own_mutex \
+                env envtmpdir
         # Save the workpath and the mutex.
         set workpath $p_workpath
         set trace_mutex $mutex
         set own_mutex 0
+        # capture user's TMPDIR for ignoring path elements created there.
+        if {[info exists env(TMPDIR)]} {
+                set envtmpdir $env(TMPDIR);
+        }
         # Create a virtual filemap.
         filemap create trace_filemap
         set ports_list {}