dont return sometimes a String, sometimes a Filename from defaultTempDirectoryName
authorClaus Gittinger <cg@exept.de>
Wed, 23 Jan 2008 14:59:36 +0100
changeset 10851 7d9c2ac9a7c9
parent 10850 d9e6b9343e57
child 10852 e8dd1b4af8da
dont return sometimes a String, sometimes a Filename from defaultTempDirectoryName
PCFilename.st
--- a/PCFilename.st	Wed Jan 23 14:59:00 2008 +0100
+++ b/PCFilename.st	Wed Jan 23 14:59:36 2008 +0100
@@ -163,7 +163,7 @@
      This is used, if no special preferences were defined in
      any of the TEMP-environment variables (see tempDirectory)."
 
-    |vol tempDir|
+    |winDir vol tempDir|
 
     #('TMPDIR' 'TEMPDIR' 'TEMP' 'TMP') do:[:envVar |
         tempDir isNil ifTrue:[
@@ -181,28 +181,29 @@
                     ].
                 ].
                 tempDir asFilename exists ifTrue:[
-                    ^ tempDir.
+                    ^ tempDir asFilename.
                 ].
             ].
         ].
     ].
 
-    vol := OperatingSystem getWindowsDirectory asFilename volume.
+    winDir := OperatingSystem getWindowsDirectory asFilename.
+    vol := winDir volume.
     tempDir := vol asFilename construct:'temp'. 
     tempDir exists ifTrue:[ ^tempDir ].
 
     tempDir := vol asFilename construct:'tmp'. 
     tempDir exists ifTrue:[ ^tempDir ].
 
-    tempDir := OperatingSystem getWindowsDirectory asFilename construct:'temp'.
+    tempDir := winDir construct:'temp'.
     tempDir exists ifTrue:[ ^tempDir ].
 
     ^ '.\temp'
 
     "
      Filename defaultTempDirectoryName           
-     Filename defaultTempDirectoryName asFilename exists         
-     Filename defaultTempDirectoryName asFilename isWritable         
+     Filename defaultTempDirectoryName exists         
+     Filename defaultTempDirectoryName isWritable         
     "
 ! !
 
@@ -838,5 +839,5 @@
 !PCFilename class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PCFilename.st,v 1.41 2007-06-27 12:06:58 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PCFilename.st,v 1.42 2008-01-23 13:59:36 cg Exp $'
 ! !