[PATCH] gitk: avoid mkdtemp on Windows

From

David Aguilar <davvid@gmail.com>

Date

Jun 15, 2014, 22:23 UTC

Message-ID

<1402871036-1389-1-git-send-email-davvid@gmail.com>

The Unix code path retains new TMPDIR behavior.

Reported-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
 gitk | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gitk b/gitk
index 41e5071..66d8c9e 100755
--- a/gitk
+++ b/gitk
@@ -3496,15 +3496,22 @@ proc gitknewtmpdir {} {
     global diffnum gitktmpdir gitdir env
 
     if {![info exists gitktmpdir]} {
-	if {[info exists env(GITK_TMPDIR)]} {
-	    set tmpdir $env(GITK_TMPDIR)
-	} elseif {[info exists env(TMPDIR)]} {
-	    set tmpdir $env(TMPDIR)
+	if {$::tcl_platform(platform) eq {windows}} {
+	    # Windows does not have mkdtemp so use the current directory
+	    # to avoid using an unsafe pattern in a world-writeable
+	    # temporary directory.
+	    set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
 	} else {
-	    set tmpdir $gitdir
+	    if {[info exists env(GITK_TMPDIR)]} {
+		set tmpdir $env(GITK_TMPDIR)
+	    } elseif {[info exists env(TMPDIR)]} {
+		set tmpdir $env(TMPDIR)
+	    } else {
+		set tmpdir $gitdir
+	    }
+	    set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
+	    set gitktmpdir [exec mktemp -d $gitktmpformat]
 	}
-	set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
-	set gitktmpdir [exec mktemp -d $gitktmpformat]
 	if {[catch {file mkdir $gitktmpdir} err]} {
 	    error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
 	    unset gitktmpdir

-- 
2.0.0.257.g75cc6c6