Filename.st
branchjv
changeset 18678 a9b30d72dff9
parent 18640 358b275dced9
parent 18667 ed22f49c33f1
child 18688 43370946620c
--- a/Filename.st	Mon Aug 03 21:05:52 2015 +0100
+++ b/Filename.st	Wed Aug 05 22:44:27 2015 +0100
@@ -2,7 +2,7 @@
 
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
-              All Rights Reserved
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -27,7 +27,7 @@
 copyright
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
-              All Rights Reserved
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -49,19 +49,19 @@
     for being correct or existing.
     Thus, it is possible to do queries such as:
 
-        '/fee/foo/foe' asFilename exists     
-        '/not_existing' asFilename isDirectory 
-        '/foo/bar' asFilename isReadable 
+	'/fee/foo/foe' asFilename exists
+	'/not_existing' asFilename isDirectory
+	'/foo/bar' asFilename isReadable
 
     (all of the above examples will probably return false on your machine ;-).
 
     examples:
 
-        'Makefile' asFilename readStream
-
-        'newFile' asFilename writeStream
-
-        Filename newTemporary writeStream
+	'Makefile' asFilename readStream
+
+	'newFile' asFilename writeStream
+
+	Filename newTemporary writeStream
 
     Beside lots of protocol to query for a files attributes, the class
     protocol offers methods for filename completion, to construct pathes
@@ -74,150 +74,150 @@
     class methods are delegated to concrete implementations in various subclasses like
     UnixFilename, PCFilename, ...
     The delegation is implemented in a way, so that some methods of
-    specific OS Filenames might be used, even if ST/X is currently running 
+    specific OS Filenames might be used, even if ST/X is currently running
     on a different OS (as long as the method does not depend on the OperatingSystem class).
 
     [author:]
-        Claus Gittinger
+	Claus Gittinger
 
     [see also:]
-        String
-        FileStream DirectoryStream PipeStream Socket
-        OperatingSystem
-        Date Time
+	String
+	FileStream DirectoryStream PipeStream Socket
+	OperatingSystem
+	Date Time
 "
 !
 
 examples
 "
     does a file/directory exist ?:
-                                                                        [exBegin]
-        |f|
-
-        f := 'foobar' asFilename.
-        ^ f exists  
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := 'foobar' asFilename.
+	^ f exists
+									[exEnd]
 
 
     is it a directory ?:
-                                                                        [exBegin]
-        |f|
-
-        f := '/tmp' asFilename.
-        ^ f isDirectory.   
-                                                                        [exEnd]
-
-        
+									[exBegin]
+	|f|
+
+	f := '/tmp' asFilename.
+	^ f isDirectory.
+									[exEnd]
+
+
     get the working directory:
-                                                                        [exBegin]
-        ^ Filename defaultDirectory
-                                                                        [exEnd]
-
-
-    get a files full pathname 
+									[exBegin]
+	^ Filename defaultDirectory
+									[exEnd]
+
+
+    get a files full pathname
     (caring for relative names or symbolic links):
-                                                                        [exBegin]
-        |f|
-
-        f := '..' asFilename.
-        ^ f pathName  
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := '..' asFilename.
+	^ f pathName
+									[exEnd]
 
 
     get a directories directory:
-                                                                        [exBegin]
-        |f|
-
-        f := Filename defaultDirectory.
-        ^ f directory 
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := Filename defaultDirectory.
+	^ f directory
+									[exEnd]
 
 
     get a files directory:
-                                                                        [exBegin]
-        |f|
-
-        f := './smalltalk' asFilename.
-        ^ f directory 
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := './smalltalk' asFilename.
+	^ f directory
+									[exEnd]
 
 
     getting access & modification times:
-                                                                        [exBegin]
-        |f|
-
-        f := '/tmp' asFilename.
-        ^ f dates
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := '/tmp' asFilename.
+	^ f dates
+									[exEnd]
 
     access time only:
-                                                                        [exBegin]
-        |f|
-
-        f := '/tmp' asFilename.
-        ^ f dates at:#accessed  
-                                                                        [exEnd]
-        
+									[exBegin]
+	|f|
+
+	f := '/tmp' asFilename.
+	^ f dates at:#accessed
+									[exEnd]
+
 
     getting all information on a file/directory:
-                                                                        [exBegin]
-        |f|
-
-        f := '/tmp' asFilename.
-        ^ f info
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := '/tmp' asFilename.
+	^ f info
+									[exEnd]
 
 
     getting a temporary file (unique name):
-                                                                        [exBegin]
-        |f|
-
-        f := Filename newTemporary.
-        ^ f    
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := Filename newTemporary.
+	^ f
+									[exEnd]
 
     creating, writing, reading and removing a temporary file:
-                                                                        [exBegin]
-        |f writeStream readStream|
-
-        f := Filename newTemporary.
-        writeStream := f writeStream.
-        writeStream nextPutAll:'hello world'.
-        writeStream cr.
-        writeStream close.
-
-        'contents (as seen by unix''s cat command:' printNL.
-        OperatingSystem executeCommand:('cat ' , f pathName).
-
-        readStream := f readStream.
-        Transcript showCR:'contents as seen by smalltalk:'.
-        Transcript showCR:(readStream upToEnd).
-        readStream close.
-
-        f delete.
-                                                                        [exEnd]
-        
+									[exBegin]
+	|f writeStream readStream|
+
+	f := Filename newTemporary.
+	writeStream := f writeStream.
+	writeStream nextPutAll:'hello world'.
+	writeStream cr.
+	writeStream close.
+
+	'contents (as seen by unix''s cat command:' printNL.
+	OperatingSystem executeCommand:('cat ' , f pathName).
+
+	readStream := f readStream.
+	Transcript showCR:'contents as seen by smalltalk:'.
+	Transcript showCR:(readStream upToEnd).
+	readStream close.
+
+	f delete.
+									[exEnd]
+
 
     getting a directories contents:
-                                                                        [exBegin]
-        |f files|
-
-        f := Filename currentDirectory.
-        files := f directoryContents.
-        Transcript showCR:'the files are:'.
-        Transcript showCR:(files printString).
-                                                                        [exEnd]
+									[exBegin]
+	|f files|
+
+	f := Filename currentDirectory.
+	files := f directoryContents.
+	Transcript showCR:'the files are:'.
+	Transcript showCR:(files printString).
+									[exEnd]
 
 
     editing a file:
-                                                                        [exBegin]
-        |f|
-
-        f := Filename newTemporary.
-        (f writeStream) nextPutAll:'hello world'; close.
-
-        f edit
-                                                                        [exEnd]
+									[exBegin]
+	|f|
+
+	f := Filename newTemporary.
+	(f writeStream) nextPutAll:'hello world'; close.
+
+	f edit
+									[exEnd]
 "
 ! !
 
@@ -227,7 +227,7 @@
     "initialize for the OS we are running on"
 
     ConcreteClass isNil ifTrue:[
-        self initializeConcreteClass
+	self initializeConcreteClass
     ].
 
     "
@@ -241,17 +241,17 @@
     "initialize for the OS we are running on"
 
     OperatingSystem isUNIXlike ifTrue:[
-        ConcreteClass := UnixFilename
+	ConcreteClass := UnixFilename
     ] ifFalse:[OperatingSystem isMSDOSlike ifTrue:[
-        ConcreteClass := PCFilename
+	ConcreteClass := PCFilename
     ] ifFalse:[OperatingSystem isVMSlike ifTrue:[
-        ConcreteClass := OpenVMSFilename
+	ConcreteClass := OpenVMSFilename
     ] ifFalse:[
-        self error:'Filename: unknown OperatingSystem when initializing concrete Filename class'.
+	self error:'Filename: unknown OperatingSystem when initializing concrete Filename class'.
     ]]].
 
     ConcreteClass isNil ifTrue:[
-        self error:'Filename: Missing concrete Filename class'.
+	self error:'Filename: Missing concrete Filename class'.
     ].
 
     "
@@ -288,14 +288,14 @@
     |exeName|
 
     Smalltalk isStandAloneApp ifTrue:[
-        exeName := OperatingSystem nameOfSTXExecutable.
+	exeName := OperatingSystem nameOfSTXExecutable.
     ] ifFalse:[
-        exeName := 'smalltalk'
+	exeName := 'smalltalk'
     ].
     ^ self applicationDataDirectoryFor:exeName
 
-    "                    
-     Filename applicationDataDirectory   
+    "
+     Filename applicationDataDirectory
     "
 !
 
@@ -310,18 +310,18 @@
 
     s := OperatingSystem getApplicationDataDirectoryFor:appName.
     s isNil ifTrue:[
-        ^ self homeDirectory
+	^ self homeDirectory
     ].
     dir := self named:s.
     dir exists ifFalse:[
-        dir makeDirectory
+	dir makeDirectory
     ].
     ^ dir
 
-    "                    
-     Filename applicationDataDirectoryFor:'smalltalk'        
-     Filename applicationDataDirectoryFor:'expecco'        
-      applicationDataDirectoryFor:'expecco'        
+    "
+     Filename applicationDataDirectoryFor:'smalltalk'
+     Filename applicationDataDirectoryFor:'expecco'
+      applicationDataDirectoryFor:'expecco'
     "
 
     "Created: / 29-07-2010 / 12:05:35 / sr"
@@ -333,7 +333,7 @@
     ^ self named:(OperatingSystem getCurrentDirectory).
 
     "
-     Filename currentDirectory 
+     Filename currentDirectory
     "
 !
 
@@ -343,7 +343,7 @@
     ^ self currentDirectory
 
     "
-     Filename defaultDirectory 
+     Filename defaultDirectory
     "
 !
 
@@ -354,25 +354,25 @@
      Use this for files which MUST remain the same (stx_sourceCache)"
 
     DefaultTempDirectory isNil ifTrue:[
-        self tempDirectory.  "/ actually sets DefaultTempDirectory as side effect
-        DefaultTempDirectory isNil ifTrue:[
-            DefaultTempDirectory := TempDirectory
-        ].
+	self tempDirectory.  "/ actually sets DefaultTempDirectory as side effect
+	DefaultTempDirectory isNil ifTrue:[
+	    DefaultTempDirectory := TempDirectory
+	].
     ].
 
     DefaultTempDirectory exists ifFalse:[
-        DefaultTempDirectory
-            makeDirectory; 
-            addAccessRights:#(readUser readGroup readOthers 
-                              writeUser writeGroup writeOthers
-                              executeUser executeGroup executeOthers
-                              removeOnlyByOwner).
+	DefaultTempDirectory
+	    makeDirectory;
+	    addAccessRights:#(readUser readGroup readOthers
+			      writeUser writeGroup writeOthers
+			      executeUser executeGroup executeOthers
+			      removeOnlyByOwner).
     ].
     ^ DefaultTempDirectory
 
     "
-     Filename tempDirectory           
-     Filename defaultTempDirectory           
+     Filename tempDirectory
+     Filename defaultTempDirectory
     "
 
     "Created: / 07-03-1996 / 14:51:18 / cg"
@@ -381,19 +381,19 @@
 
 desktopDirectory
     "return your desktop directory.
-     Under windows, thats the real desktop directory; 
+     Under windows, thats the real desktop directory;
      under other OperatingSystems, the home directory is returned."
 
     |s|
 
     s := OperatingSystem getDesktopDirectory.
     s isNil ifTrue:[
-        ^ self homeDirectory
+	^ self homeDirectory
     ].
     ^ self named:s
 
     "
-     Filename desktopDirectory        
+     Filename desktopDirectory
     "
 
     "Created: / 16-05-2007 / 13:18:34 / cg"
@@ -401,19 +401,19 @@
 
 documentsDirectory
     "return your documents directory.
-     Under windows, thats the real 'Documents' or 'My Documents'; 
+     Under windows, thats the real 'Documents' or 'My Documents';
      under other OperatingSystems, the home directory is returned."
 
     |s|
 
     s := OperatingSystem getDocumentsDirectory.
     s isNil ifTrue:[
-        ^ self homeDirectory
+	^ self homeDirectory
     ].
     ^ self named:s
 
     "
-     Filename documentsDirectory        
+     Filename documentsDirectory
     "
 
     "Created: / 16-05-2007 / 13:18:34 / cg"
@@ -433,48 +433,48 @@
      root directory (i.e. '/') an absolute path-filename is returned."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass fromComponents:aCollectionOfDirectoryNames
+	^ ConcreteClass fromComponents:aCollectionOfDirectoryNames
     ].
 
     ^ self named:(self nameFromComponents:aCollectionOfDirectoryNames)
 
     "
-     Filename fromComponents:#('/' 'foo' 'bar' 'baz')  
-     PCFilename fromComponents:#('/' 'foo' 'bar' 'baz')  
-     UnixFilename fromComponents:#('/' 'foo' 'bar' 'baz')  
+     Filename fromComponents:#('/' 'foo' 'bar' 'baz')
+     PCFilename fromComponents:#('/' 'foo' 'bar' 'baz')
+     UnixFilename fromComponents:#('/' 'foo' 'bar' 'baz')
      OpenVMSFilename fromComponents:#('foo' 'bar' 'baz')
 
-     Filename fromComponents:#('foo' 'bar' 'baz')  
-     Filename fromComponents:#('/')  
+     Filename fromComponents:#('foo' 'bar' 'baz')
+     Filename fromComponents:#('/')
 
      Filename fromComponents:
-         (Filename components:('.' asFilename pathName))
+	 (Filename components:('.' asFilename pathName))
 
      Filename fromComponents:
-         (Filename components:('.' asFilename name)) 
+	 (Filename components:('.' asFilename name))
     "
 
     "Modified: 8.9.1997 / 00:23:16 / cg"
 !
 
 fromUser
-    "show a box to enter a filename. 
+    "show a box to enter a filename.
      Return a filename instance or nil (if cancel was pressed)."
 
     |name|
 
-    name := Dialog 
-        requestFileName:'filename:' 
-        default:nil
-        fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
+    name := Dialog
+	requestFileName:'filename:'
+	default:nil
+	fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
 
     name notEmptyOrNil ifTrue:[
-        ^ self named:name
+	^ self named:name
     ].
     ^ nil
 
     "
-     Filename fromUser 
+     Filename fromUser
     "
 
     "Modified: 19.4.1996 / 13:57:44 / cg"
@@ -490,12 +490,12 @@
 
     s := OperatingSystem getHomeDirectory.
     s isNil ifTrue:[
-        ^ self defaultDirectory
+	^ self defaultDirectory
     ].
     ^ self named:s
 
     "
-     Filename homeDirectory        
+     Filename homeDirectory
     "
 
     "Modified: 8.9.1997 / 00:25:23 / cg"
@@ -506,7 +506,7 @@
      This is the same as 'aString asFilename'."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass named:aString
+	^ ConcreteClass named:aString
     ].
     ^ self basicNew setName:aString
 
@@ -522,7 +522,7 @@
      The filenames returned are '/tmp/stxtmp_xx_nn' where xx is our
      unix process id, and nn is a unique number, incremented with every
      call to this method.
-     If any of the environment variables ST_TMPDIR or TMPDIR is set, 
+     If any of the environment variables ST_TMPDIR or TMPDIR is set,
      its value defines the temp directory.
      Notice, that no file is created by this - only a unique name
      is generated.
@@ -536,8 +536,8 @@
     ^ self newTemporaryIn:(self tempDirectory)
 
     "
-     Filename newTemporary    
-     Filename newTemporary     
+     Filename newTemporary
+     Filename newTemporary
     "
 
     "Modified: 7.9.1995 / 10:48:31 / claus"
@@ -549,7 +549,7 @@
      The directories returned are '/tmp/stxtmp_xx_nn' where xx is our
      unix process id, and nn is a unique number, incremented with every
      call to this method.
-     If any of the environment variables ST_TMPDIR or TMPDIR is set, 
+     If any of the environment variables ST_TMPDIR or TMPDIR is set,
      its value defines the temp directory."
 
     ^ self newTemporaryDirectoryIn:(self tempDirectory)
@@ -561,14 +561,14 @@
      The directories returned are '/tmp/stxtmp_xx_nn' where xx is our
      unix process id, and nn is a unique number, incremented with every
      call to this method.
-     If any of the environment variables ST_TMPDIR or TMPDIR is set, 
+     If any of the environment variables ST_TMPDIR or TMPDIR is set,
      its value defines the temp directory."
 
     |tempdir|
 
     tempdir := self newTemporaryIn:aDirectoryOrNil.
     tempdir exists ifTrue:[
-        tempdir recursiveRemove.
+	tempdir recursiveRemove.
     ].
     tempdir makeDirectory.
     ^ tempdir
@@ -577,7 +577,7 @@
 newTemporaryIn:aDirectoryOrNil
     "return a new unique filename - use this for temporary files.
      The filenames returned are in aDirectoryPrefix and named 'stxtmp_xx_nn',
-     where xx is our unix process id, and nn is a unique number, incremented 
+     where xx is our unix process id, and nn is a unique number, incremented
      with every call to this method.
      Notice: only a unique filename object is created and returned - no physical
      file is created by this method (i.e. you have to send #writeStream or
@@ -590,24 +590,24 @@
 
     "temp files in '/tmp':
 
-     Filename newTemporary    
-    "
-
-    "temp files somewhere 
+     Filename newTemporary
+    "
+
+    "temp files somewhere
      (not recommended - use above since it can be controlled via shell variables):
 
-     UnixFilename newTemporaryIn:'/tmp'    
-     UnixFilename newTemporaryIn:'/tmp'  
-     UnixFilename newTemporaryIn:'/usr/tmp'    
-     UnixFilename newTemporaryIn:'/'  
+     UnixFilename newTemporaryIn:'/tmp'
+     UnixFilename newTemporaryIn:'/tmp'
+     UnixFilename newTemporaryIn:'/usr/tmp'
+     UnixFilename newTemporaryIn:'/'
     "
 
     "a local temp file:
 
-     Filename newTemporaryIn:''         
-     Filename newTemporaryIn:nil         
-     Filename newTemporaryIn:'.'         
-     Filename newTemporaryIn:('source' asFilename) 
+     Filename newTemporaryIn:''
+     Filename newTemporaryIn:nil
+     Filename newTemporaryIn:'.'
+     Filename newTemporaryIn:('source' asFilename)
     "
 
     "Modified: / 7.9.1995 / 10:48:31 / claus"
@@ -617,7 +617,7 @@
 newTemporaryIn:aDirectoryOrNil nameTemplate:template
     "return a new unique filename - use this for temporary files.
      The filenames returned are in aDirectoryOrNil and named after the given template,
-     in which %1 and %2 are expanded to the unix process id, and a unique number, incremented 
+     in which %1 and %2 are expanded to the unix process id, and a unique number, incremented
      with every call to this method respectively.
      Notice: only a unique filename object is created and returned - no physical
      file is created by this method (i.e. you have to send #writeStream or
@@ -629,52 +629,52 @@
     |nameString newTempFilename|
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass newTemporaryIn:aDirectoryOrNil nameTemplate:template
+	^ ConcreteClass newTemporaryIn:aDirectoryOrNil nameTemplate:template
     ].
 
     "although the above allows things to be redefined in concrete classes,
      the following should work on all systems ..."
 
     [
-        "Use random numbers in order to improve the security 
-         by making the generated names less predictable"
-        nameString := template bindWith:(OperatingSystem getProcessId) with:RandomGenerator new nextInteger.
-
-        aDirectoryOrNil isNil ifTrue:[
-            newTempFilename := self named:nameString
-        ] ifFalse:[
-            newTempFilename := aDirectoryOrNil asFilename construct:nameString
-        ]
+	"Use random numbers in order to improve the security
+	 by making the generated names less predictable"
+	nameString := template bindWith:(OperatingSystem getProcessId) with:RandomGenerator new nextInteger.
+
+	aDirectoryOrNil isNil ifTrue:[
+	    newTempFilename := self named:nameString
+	] ifFalse:[
+	    newTempFilename := aDirectoryOrNil asFilename construct:nameString
+	]
     ] doWhile:[
-        "care for existing leftOver tempFiles
-         from a previous boot of the OS
-         i.e. my pid could be the same as when executed
-         the last time before system reboot ...)"
-
-        newTempFilename exists
+	"care for existing leftOver tempFiles
+	 from a previous boot of the OS
+	 i.e. my pid could be the same as when executed
+	 the last time before system reboot ...)"
+
+	newTempFilename exists
     ].
     ^ newTempFilename
 
     "temp files in '/tmp':
 
-     Filename newTemporary    
-    "
-
-    "temp files somewhere 
+     Filename newTemporary
+    "
+
+    "temp files somewhere
      (not recommended - use above since it can be controlled via shell variables):
 
-     UnixFilename newTemporaryIn:'/tmp'     nameTemplate:'foo%1_%2'    
-     UnixFilename newTemporaryIn:'/tmp'     nameTemplate:'foo%1_%2'  
-     UnixFilename newTemporaryIn:'/usr/tmp' nameTemplate:'foo%1_%2'    
-     UnixFilename newTemporaryIn:'/'        nameTemplate:'foo%1_%2' 
+     UnixFilename newTemporaryIn:'/tmp'     nameTemplate:'foo%1_%2'
+     UnixFilename newTemporaryIn:'/tmp'     nameTemplate:'foo%1_%2'
+     UnixFilename newTemporaryIn:'/usr/tmp' nameTemplate:'foo%1_%2'
+     UnixFilename newTemporaryIn:'/'        nameTemplate:'foo%1_%2'
     "
 
     "a local temp file:
 
-     Filename newTemporaryIn:''             nameTemplate:'foo%1_%2' 
-     Filename newTemporaryIn:nil            nameTemplate:'foo%1_%2' 
-     Filename newTemporaryIn:'.'            nameTemplate:'foo%1_%2' 
-     Filename newTemporaryIn:('source' asFilename) nameTemplate:'foo%1_%2' 
+     Filename newTemporaryIn:''             nameTemplate:'foo%1_%2'
+     Filename newTemporaryIn:nil            nameTemplate:'foo%1_%2'
+     Filename newTemporaryIn:'.'            nameTemplate:'foo%1_%2'
+     Filename newTemporaryIn:('source' asFilename) nameTemplate:'foo%1_%2'
     "
 
     "Modified: / 07-09-1995 / 10:48:31 / claus"
@@ -689,7 +689,7 @@
 
     s := self nullFilename.
     s isNil ifTrue:[
-        ^ nil
+	^ nil
     ].
     ^ self named:s
 
@@ -704,34 +704,34 @@
 
 remoteHost:remoteHostString rootComponents:aCollectionOfDirectoryNames
     "create & return a new filename from components given in
-     aCollectionOfDirectoryNames on a host named remoteHostString. 
+     aCollectionOfDirectoryNames on a host named remoteHostString.
      An absolute network-filename is returned."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass remoteHost:remoteHostString 
-                        rootComponents:aCollectionOfDirectoryNames
+	^ ConcreteClass remoteHost:remoteHostString
+			rootComponents:aCollectionOfDirectoryNames
     ].
 
     remoteHostString notEmptyOrNil ifTrue:[
-        self error:'remote hosts are not supported by OS'
+	self error:'remote hosts are not supported by OS'
     ].
 
     ^ self rootComponents:aCollectionOfDirectoryNames
 
     "
-      'file:///tmp/test' asURI asFilename 
+      'file:///tmp/test' asURI asFilename
     "
 !
 
 rootComponents:aCollectionOfDirectoryNames
     "create & return a new filename from components given in
-     aCollectionOfDirectoryNames. 
+     aCollectionOfDirectoryNames.
      An absolute path-filename is returned."
 
     |sep s|
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass rootComponents:aCollectionOfDirectoryNames
+	^ ConcreteClass rootComponents:aCollectionOfDirectoryNames
     ].
 
     "/ fallBack - works on Unix & MSDOS
@@ -739,9 +739,9 @@
     sep := self separatorString.
     s := CharacterWriteStream new.
     aCollectionOfDirectoryNames do:[:component |
-        component ~= sep ifTrue:[
-            s nextPutAll:sep; nextPutAll:component
-        ]
+	component ~= sep ifTrue:[
+	    s nextPutAll:sep; nextPutAll:component
+	]
     ].
     s := s contents.
     s size == 0 ifTrue:[s := sep].
@@ -750,17 +750,17 @@
     "
      Filename rootComponents:#('/' 'foo' 'bar' 'baz')
 
-     Filename rootComponents:#('foo' 'bar' 'baz')  
-     PCFilename rootComponents:#('foo' 'bar' 'baz')  
-     UnixFilename rootComponents:#('foo' 'bar' 'baz')  
-
-     Filename rootComponents:#('/')  
+     Filename rootComponents:#('foo' 'bar' 'baz')
+     PCFilename rootComponents:#('foo' 'bar' 'baz')
+     UnixFilename rootComponents:#('foo' 'bar' 'baz')
+
+     Filename rootComponents:#('/')
 
      Filename rootComponents:
-         (Filename components:('.' asFilename pathName))
+	 (Filename components:('.' asFilename pathName))
 
      Filename rootComponents:
-         (Filename components:('.' asFilename name)) 
+	 (Filename components:('.' asFilename name))
     "
 
     "Modified: 8.9.1997 / 00:23:16 / cg"
@@ -770,7 +770,7 @@
     "return a filename for the root directory"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass rootDirectory
+	^ ConcreteClass rootDirectory
     ].
 
     "/ fallBack - works on Unix & MSDOS (but not on VMS)
@@ -788,7 +788,7 @@
     "return a filename for the root directory on some volume"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass rootDirectoryOnVolume:aVolumeName
+	^ ConcreteClass rootDirectoryOnVolume:aVolumeName
     ].
 
     "/ fallBack - works on Unix (not on MSDOS or VMS)
@@ -806,26 +806,26 @@
 tempDirectory
     "return the temp directory as a filename.
      If any of the environment variables STX_TMPDIR, ST_TMPDIR,
-     TMPDIR or TEMPDIR is set, its value defines the name, 
+     TMPDIR or TEMPDIR is set, its value defines the name,
      otherwise, '/tmp' is used. (at least on unix ...).
 
      Notice: do not hardcode '/tmp' into your programs - things may be
-             different on other operating systems. Also, the user may want to set the
-             TMPDIR environment variable to have her temp files somewhere else."
+	     different on other operating systems. Also, the user may want to set the
+	     TMPDIR environment variable to have her temp files somewhere else."
 
     |tempDir|
 
     TempDirectory isNil ifTrue:[
-        tempDir := self named:(self defaultTempDirectoryName pathName).
-        tempDir exists ifFalse:[
-            tempDir
-                makeDirectory; 
-                addAccessRights:#(readUser readGroup readOthers 
-                                  writeUser writeGroup writeOthers
-                                  executeUser executeGroup executeOthers
-                                  removeOnlyByOwner).
-        ].
-        TempDirectory := DefaultTempDirectory := tempDir construct:'stx_tmp'.
+	tempDir := self named:(self defaultTempDirectoryName pathName).
+	tempDir exists ifFalse:[
+	    tempDir
+		makeDirectory;
+		addAccessRights:#(readUser readGroup readOthers
+				  writeUser writeGroup writeOthers
+				  executeUser executeGroup executeOthers
+				  removeOnlyByOwner).
+	].
+	TempDirectory := DefaultTempDirectory := tempDir construct:'stx_tmp'.
     ].
 
     "Make sure, that the TempDirectory exists - it might have been removed
@@ -833,22 +833,22 @@
      Since it is shared between users, it must be accessable by all users."
 
     TempDirectory exists ifFalse:[
-        TempDirectory 
-            makeDirectory; 
-            addAccessRights:#(readUser readGroup readOthers 
-                              writeUser writeGroup writeOthers
-                              executeUser executeGroup executeOthers
-                              removeOnlyByOwner).
+	TempDirectory
+	    makeDirectory;
+	    addAccessRights:#(readUser readGroup readOthers
+			      writeUser writeGroup writeOthers
+			      executeUser executeGroup executeOthers
+			      removeOnlyByOwner).
     ].
     ^ TempDirectory
 
     "
-     Filename tempDirectory           
-     Filename tempDirectory pathName   
-     Filename tempDirectory exists    
-     Filename tempDirectory isWritable   
-     (Filename tempDirectory construct:'foo') makeDirectory   
-     (Filename tempDirectory construct:'foo') remove   
+     Filename tempDirectory
+     Filename tempDirectory pathName
+     Filename tempDirectory exists
+     Filename tempDirectory isWritable
+     (Filename tempDirectory construct:'foo') makeDirectory
+     (Filename tempDirectory construct:'foo') remove
     "
 
     "Created: / 07-03-1996 / 14:51:18 / cg"
@@ -864,8 +864,8 @@
     |temp|
 
     aFilename isNil ifTrue:[
-        TempDirectory := nil.
-        ^ self.
+	TempDirectory := nil.
+	^ self.
     ].
 
     temp := aFilename asFilename.
@@ -882,12 +882,12 @@
 
     s := OperatingSystem getTrashDirectory.
     s isNil ifTrue:[
-        ^ nil
+	^ nil
     ].
     ^ self named:s
 
     "
-     Filename desktopDirectory        
+     Filename desktopDirectory
     "
 
     "Created: / 16-05-2007 / 13:18:34 / cg"
@@ -928,13 +928,13 @@
      any of the TEMP-environment variables (see tempDirectory)."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass defaultTempDirectoryName
+	^ ConcreteClass defaultTempDirectoryName
     ].
 
     ^ '/tmp' asFilename
 
     "
-     Filename defaultTempDirectoryName           
+     Filename defaultTempDirectoryName
     "
 
     "Modified: 7.9.1995 / 10:48:31 / claus"
@@ -956,70 +956,70 @@
 !
 
 nameWithSpecialExpansions:aString
-    "return the nameString, expanding any OS specific macros. 
+    "return the nameString, expanding any OS specific macros.
      Here, a ~/ or ~user/ prefix is expanded to the users home dir (as in csh)"
 
     |dir user cutIdx idx userInfo|
 
     (aString startsWith:'~') ifFalse:[
-        ^ aString.
+	^ aString.
     ].
 
     aString size > 1 ifTrue:[
-        idx := aString indexOf:self separator.
-        idx == 0 ifTrue:[
-            "aString is '~user'"
-            user := aString copyFrom:2.
-            cutIdx := aString size + 1.
-        ] ifFalse:[
-            "aString is '~user/something'"
-            user := aString copyFrom:2 to:(idx - 1).
-            cutIdx := idx.
-        ].
-        user notEmpty ifTrue:[
-            userInfo := OperatingSystem userInfoOf:user.
-            userInfo notNil ifTrue:[
-                dir := userInfo at:#dir ifAbsent:nil.
-            ].
-            dir isNil ifTrue:[
+	idx := aString indexOf:self separator.
+	idx == 0 ifTrue:[
+	    "aString is '~user'"
+	    user := aString copyFrom:2.
+	    cutIdx := aString size + 1.
+	] ifFalse:[
+	    "aString is '~user/something'"
+	    user := aString copyFrom:2 to:(idx - 1).
+	    cutIdx := idx.
+	].
+	user notEmpty ifTrue:[
+	    userInfo := OperatingSystem userInfoOf:user.
+	    userInfo notNil ifTrue:[
+		dir := userInfo at:#dir ifAbsent:nil.
+	    ].
+	    dir isNil ifTrue:[
 "/                 ('Filename [info]: unknown user: ' , user) infoPrintCR.
-                ^ aString
-            ].
-        ].
+		^ aString
+	    ].
+	].
     ].
     dir isNil ifTrue:[
-        "aString is '~' or '~/'"
-        dir := OperatingSystem getHomeDirectory.
-        cutIdx := 2.
+	"aString is '~' or '~/'"
+	dir := OperatingSystem getHomeDirectory.
+	cutIdx := 2.
     ].
 
     ^ dir , (aString copyFrom:cutIdx)
 
     "
-     Filename new nameWithSpecialExpansions:'~'      
-     Filename new nameWithSpecialExpansions:'~\work'  
-     Filename new nameWithSpecialExpansions:'~stefan'     
-     Filename new nameWithSpecialExpansions:'~stefan\work' 
-     Filename new nameWithSpecialExpansions:'~foo'    
-     Filename new nameWithSpecialExpansions:'~foo\bar' 
-    "
-
-    "
-     UnixFilename new nameWithSpecialExpansions:'~'      
-     UnixFilename new nameWithSpecialExpansions:'~/work'  
-     UnixFilename new nameWithSpecialExpansions:'~stefan'     
-     UnixFilename new nameWithSpecialExpansions:'~stefan/work' 
-     UnixFilename new nameWithSpecialExpansions:'~foo'    
-     UnixFilename new nameWithSpecialExpansions:'~foo/bar' 
-    "
-
-    "
-     PCFilename new nameWithSpecialExpansions:'~'      
-     PCFilename new nameWithSpecialExpansions:'~\work'   
-     PCFilename new nameWithSpecialExpansions:'~stefan'     
-     PCFilename new nameWithSpecialExpansions:'~stefan\work' 
-     PCFilename new nameWithSpecialExpansions:'~foo'    
-     PCFilename new nameWithSpecialExpansions:'~foo\bar' 
+     Filename new nameWithSpecialExpansions:'~'
+     Filename new nameWithSpecialExpansions:'~\work'
+     Filename new nameWithSpecialExpansions:'~stefan'
+     Filename new nameWithSpecialExpansions:'~stefan\work'
+     Filename new nameWithSpecialExpansions:'~foo'
+     Filename new nameWithSpecialExpansions:'~foo\bar'
+    "
+
+    "
+     UnixFilename new nameWithSpecialExpansions:'~'
+     UnixFilename new nameWithSpecialExpansions:'~/work'
+     UnixFilename new nameWithSpecialExpansions:'~stefan'
+     UnixFilename new nameWithSpecialExpansions:'~stefan/work'
+     UnixFilename new nameWithSpecialExpansions:'~foo'
+     UnixFilename new nameWithSpecialExpansions:'~foo/bar'
+    "
+
+    "
+     PCFilename new nameWithSpecialExpansions:'~'
+     PCFilename new nameWithSpecialExpansions:'~\work'
+     PCFilename new nameWithSpecialExpansions:'~stefan'
+     PCFilename new nameWithSpecialExpansions:'~stefan\work'
+     PCFilename new nameWithSpecialExpansions:'~foo'
+     PCFilename new nameWithSpecialExpansions:'~foo\bar'
     "
 !
 
@@ -1029,22 +1029,22 @@
      On Unix systems, special characters might also be prefixed by a backslash character."
 
     (aPath startsWith:'"') ifFalse:[
-        (aPath includes:Character space) ifTrue:[
-            ^ '"',aPath,'"'
-        ].
+	(aPath includes:Character space) ifTrue:[
+	    ^ '"',aPath,'"'
+	].
     ].
     ^ aPath
 
 
     "
-     Filename possiblyQuotedPathname:'/tmp/bla'   
-     Filename possiblyQuotedPathname:'/tmp directory/bla'   
-     Filename possiblyQuotedPathname:'/tmp directory/bla file'   
-    "
-!
-
-suggest:aFilenameString 
-    "return a fileNamestring based on the argument, 
+     Filename possiblyQuotedPathname:'/tmp/bla'
+     Filename possiblyQuotedPathname:'/tmp directory/bla'
+     Filename possiblyQuotedPathname:'/tmp directory/bla file'
+    "
+!
+
+suggest:aFilenameString
+    "return a fileNamestring based on the argument,
      which is legal on the current platform."
 
     ^ self canonicalize:aFilenameString
@@ -1058,7 +1058,7 @@
     "return a filename for the current directory"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass currentDirectoryName
+	^ ConcreteClass currentDirectoryName
     ].
 
     "/ fallBack - works on Unix & MSDOS (but not on VMS)
@@ -1066,7 +1066,7 @@
     ^ '.'
 
     "
-     Filename currentDirectoryName    
+     Filename currentDirectoryName
     "
 
     "Modified: / 8.9.1997 / 00:24:15 / cg"
@@ -1079,7 +1079,7 @@
     ^ self defaultDirectory name
 
     "
-     Filename defaultDirectoryName 
+     Filename defaultDirectoryName
     "
 !
 
@@ -1088,7 +1088,7 @@
      The default is nil here, redefined for VMS"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass directorySuffix
+	^ ConcreteClass directorySuffix
     ].
 
     ^ nil
@@ -1096,7 +1096,7 @@
 
 errorReporter
     "who knows the signals to report errors?"
-        
+
     ^ FileStream
 
     "Created: 2.7.1996 / 12:30:25 / stefan"
@@ -1107,18 +1107,18 @@
      return the longest matching filename prefix as a string.
      The boolean directoriesOnly and filesOnly control respectively,
      if only directories or only regular files are to be considered for completion.
-     If multiple files match, the exception block aBlock is evaluated with a 
+     If multiple files match, the exception block aBlock is evaluated with a
      filename representing the directory (where the match was done) as argument.
      (this may be different from the inDirectory argument, if aString is absolute
       or starts with ../)"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass 
-            filenameCompletionFor:aString 
-            directory:inDirectory       
-            directoriesOnly:directoriesOnly 
-            filesOnly:filesOnly 
-            ifMultiple:aBlock
+	^ ConcreteClass
+	    filenameCompletionFor:aString
+	    directory:inDirectory
+	    directoriesOnly:directoriesOnly
+	    filesOnly:filesOnly
+	    ifMultiple:aBlock
     ].
     ^ self filenameCompletionFor:aString directory:inDirectory directoriesOnly:directoriesOnly filesOnly:filesOnly ifMultiple:aBlock forMultipleDo:nil
 !
@@ -1128,7 +1128,7 @@
      return the longest matching filename prefix as a string.
      The boolean directoriesOnly and filesOnly control respectively,
      if only directories or only regular files are to be considered for completion.
-     If multiple files match, the exception block aBlock is evaluated with a 
+     If multiple files match, the exception block aBlock is evaluated with a
      filename representing the directory (where the match was done) as argument and the aMultipleBlock
      is evaluated with both the directory (where the match was done) and the matchSet
      (list of matched filenames)  as arguments.
@@ -1138,8 +1138,8 @@
     |s f matchSet nMatch name dir isAbsolute sep|
 
     aString size == 0 ifTrue:[
-        aBlock value:(self named:'.').
-        ^ ''
+	aBlock value:(self named:'.').
+	^ ''
     ].
 
     sep := self separator.
@@ -1152,34 +1152,34 @@
     dir := f directory.
 
     matchSet := matchSet select:[:aFilename |
-        |f isDir|
-
-        isAbsolute ifTrue:[
-            f := aFilename asFilename
-        ] ifFalse:[
-            f := (dir construct:aFilename). 
-        ].
-        isDir := f isDirectory.
-        directoriesOnly ifTrue:[
-            isDir
-        ] ifFalse:[
-            filesOnly ifTrue:[    
-                isDir not
-            ] ifFalse:[
-                true
-            ]
-        ]
+	|f isDir|
+
+	isAbsolute ifTrue:[
+	    f := aFilename asFilename
+	] ifFalse:[
+	    f := (dir construct:aFilename).
+	].
+	isDir := f isDirectory.
+	directoriesOnly ifTrue:[
+	    isDir
+	] ifFalse:[
+	    filesOnly ifTrue:[
+		isDir not
+	    ] ifFalse:[
+		true
+	    ]
+	]
     ].
 
     f := f asCanonicalizedFilename.
-        (nMatch := matchSet size) ~~ 1 ifTrue:[
-        "
-         more than one possible completion -
-        "
-        aMultipleBlock notNil ifTrue:[
-            aMultipleBlock value:f value:matchSet.
-        ].
-        aBlock value:f
+	(nMatch := matchSet size) ~~ 1 ifTrue:[
+	"
+	 more than one possible completion -
+	"
+	aMultipleBlock notNil ifTrue:[
+	    aMultipleBlock value:f value:matchSet.
+	].
+	aBlock value:f
     ].
 
     "
@@ -1189,17 +1189,17 @@
     name := f asString.
 
     nMatch <= 1 ifTrue:[
-        "
-         exactly one possible completion -
-        "
+	"
+	 exactly one possible completion -
+	"
 "/        f := dir construct:matchSet first.
-        false "directoriesOnly" ifFalse:[
-            (f exists and:[f isDirectory]) ifTrue:[
-                (name endsWith:sep) ifFalse:[
-                    name := name , sep asString
-                ].
-            ].
-        ]
+	false "directoriesOnly" ifFalse:[
+	    (f exists and:[f isDirectory]) ifTrue:[
+		(name endsWith:sep) ifFalse:[
+		    name := name , sep asString
+		].
+	    ].
+	]
     ].
 
     s := name.
@@ -1207,11 +1207,11 @@
     "/ special: if there was no change, and the string represented
     "/ is a directories name, add a directory separator
     ((nMatch == 1) or:[s = aString]) ifTrue:[
-        (s endsWith:sep) ifFalse:[
-            (self named:s) isDirectory ifTrue:[
-                ^ s , sep asString
-            ]
-        ].
+	(s endsWith:sep) ifFalse:[
+	    (self named:s) isDirectory ifTrue:[
+		^ s , sep asString
+	    ]
+	].
     ].
 
     ^ s
@@ -1231,7 +1231,7 @@
     |basePattern dir d files|
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass filesMatching:aPattern
+	^ ConcreteClass filesMatching:aPattern
     ].
 
     "/ the following works on Unix & MSDOS (but not on openVMS)
@@ -1244,7 +1244,7 @@
     ^ files collect:[:base | d constructString:base].
 
     "
-     Filename filesMatching:'*'   
+     Filename filesMatching:'*'
      Filename filesMatching:'/*'
      Filename filesMatching:'/usr/local/*'
     "
@@ -1255,14 +1255,14 @@
 isAbstract
     "return true, if this is not a concrete class"
 
-    ^ self == Filename 
+    ^ self == Filename
 !
 
 isBadCharacter:aCharacter
     "return true, if aCharacter is unallowed in a filename."
 
     self isAbstract  ifTrue:[
-        ^ ConcreteClass isBadCharacter:aCharacter
+	^ ConcreteClass isBadCharacter:aCharacter
     ].
 
     ^ aCharacter isControlCharacter
@@ -1273,7 +1273,7 @@
      We ask the OS about this, to be independent here."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass isCaseSensitive
+	^ ConcreteClass isCaseSensitive
     ].
 
     ^ OperatingSystem caseSensitiveFilenames
@@ -1284,11 +1284,11 @@
 localNameStringFrom:aString
     "ST-80 compatibility.
      what does this do ? (used in FileNavigator-goody).
-     GUESS: 
-        does it strip off any volume characters and make a path relative ?"
+     GUESS:
+	does it strip off any volume characters and make a path relative ?"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass localNameStringFrom:aString
+	^ ConcreteClass localNameStringFrom:aString
     ].
 
     ^ aString withoutPrefix:self separatorString
@@ -1302,7 +1302,7 @@
      be in size. This depends on the OperatingSystem."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass maxComponentLength
+	^ ConcreteClass maxComponentLength
     ].
     ^ OperatingSystem maxFileNameLength
 !
@@ -1312,7 +1312,7 @@
      This depends on the OperatingSystem."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass maxLength
+	^ ConcreteClass maxLength
     ].
     ^ OperatingSystem maxPathLength
 
@@ -1325,7 +1325,7 @@
      The default is nil here"
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass nullFilename
+	^ ConcreteClass nullFilename
     ].
 
     ^ OperatingSystem getNullDevice
@@ -1333,19 +1333,19 @@
     "Created: / 12.1.1998 / 12:15:30 / stefan"
 !
 
-parentDirectoryName 
+parentDirectoryName
     "return the name used for the parent directory.
-     This is '..' for unix and dos-like systems. 
+     This is '..' for unix and dos-like systems.
      (there may be more in the future."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass parentDirectoryName
+	^ ConcreteClass parentDirectoryName
     ].
 
     ^ OperatingSystem parentDirectoryName
 
     "
-     Filename parentDirectoryName  
+     Filename parentDirectoryName
     "
 
     "Modified: 8.9.1997 / 00:34:39 / cg"
@@ -1371,19 +1371,19 @@
     ^ self separator asString
 
     "
-     Filename separatorString  
+     Filename separatorString
     "
 !
 
 suffixSeparator
     "return the filename suffix separator.
-     Usually, this is $. for unix-like and msdos systems 
+     Usually, this is $. for unix-like and msdos systems
      (there is currently no known system, where this differs)"
 
      ^ $.
 
      "
-      Filename suffixSeparator  
+      Filename suffixSeparator
      "
 
     "Modified: 7.9.1995 / 11:10:43 / claus"
@@ -1396,7 +1396,7 @@
      to generate a unique filename."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass tempFileNameTemplate
+	^ ConcreteClass tempFileNameTemplate
     ].
 
     ^ 'stxtmp_%1_%2'
@@ -1411,7 +1411,7 @@
      Q: what does this do on Unix systems ? (used in FileNavigator-goody)."
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass volumes
+	^ ConcreteClass volumes
     ].
 
     ^ OperatingSystem getDriveList
@@ -1431,20 +1431,20 @@
     ^ self nameFromComponents:(self canonicalizedNameComponents:aPathString)
 
     "
-     Filename canonicalize:'/etc/../etc'      
-     Filename canonicalize:'/home/cg/../'     
-     Filename canonicalize:'/home/cg/../././'  
-     Filename canonicalize:'./home/cg/../././'     
-     Filename canonicalize:'/home/././cg/../././'   
-     Filename canonicalize:'/home/././cg/././'    
-     Filename canonicalize:'/home/cg/../../..'    
-     Filename canonicalize:'cg/../../..'    
-     Filename canonicalize:'./'      
-     Filename canonicalize:'/home/.'   
-     Filename canonicalize:'/home/../..'   
-     Filename canonicalize:'//foo'   
-     Filename canonicalize:'///foo'   
-     Filename canonicalize:'//foo//bar'   
+     Filename canonicalize:'/etc/../etc'
+     Filename canonicalize:'/home/cg/../'
+     Filename canonicalize:'/home/cg/../././'
+     Filename canonicalize:'./home/cg/../././'
+     Filename canonicalize:'/home/././cg/../././'
+     Filename canonicalize:'/home/././cg/././'
+     Filename canonicalize:'/home/cg/../../..'
+     Filename canonicalize:'cg/../../..'
+     Filename canonicalize:'./'
+     Filename canonicalize:'/home/.'
+     Filename canonicalize:'/home/../..'
+     Filename canonicalize:'//foo'
+     Filename canonicalize:'///foo'
+     Filename canonicalize:'//foo//bar'
     "
 !
 
@@ -1464,49 +1464,49 @@
     comps := self components:aPathString.
     newComps := OrderedCollection new:comps size.
     comps do:[:eachComponent |
-        eachComponent ~= dot ifTrue:[
-            eachComponent = dotDot ifTrue:[
-               (newComps isEmpty 
-                or:[(newComps size == 1 and:[newComps first startsWith:rootName]) 
-                or:[newComps last = dotDot]]) ifTrue:[
-                   newComps add:eachComponent
-               ] ifFalse:[
-                   newComps removeLast
-               ].
-            ] ifFalse:[
-                newComps add:eachComponent
-            ].
-        ]
-    ]. 
+	eachComponent ~= dot ifTrue:[
+	    eachComponent = dotDot ifTrue:[
+	       (newComps isEmpty
+		or:[(newComps size == 1 and:[newComps first startsWith:rootName])
+		or:[newComps last = dotDot]]) ifTrue:[
+		   newComps add:eachComponent
+	       ] ifFalse:[
+		   newComps removeLast
+	       ].
+	    ] ifFalse:[
+		newComps add:eachComponent
+	    ].
+	]
+    ].
     "/ add current Directory if empty
     newComps isEmpty ifTrue:[
-        newComps add:dot.
+	newComps add:dot.
     ].
     ^ newComps
 
     "
-     Filename canonicalizedNameComponents:'/etc/../etc'      
-     Filename canonicalizedNameComponents:'/home/cg/../'     
-     Filename canonicalizedNameComponents:'/home/cg/../././'  
-     Filename canonicalizedNameComponents:'./home/cg/../././'     
-     Filename canonicalizedNameComponents:'/home/././cg/../././'   
-     Filename canonicalizedNameComponents:'/home/././cg/././'    
-     Filename canonicalizedNameComponents:'/home/cg/../../..'    
-     Filename canonicalizedNameComponents:'cg/../../..'    
-     Filename canonicalizedNameComponents:'/'      
-     Filename canonicalizedNameComponents:'./'      
-     Filename canonicalizedNameComponents:'/.'      
-     Filename canonicalizedNameComponents:'/home/.'   
-     Filename canonicalizedNameComponents:'/home'   
-     Filename canonicalizedNameComponents:'/home/../..'   
-     Filename canonicalizedNameComponents:'//foo'   
-     Filename canonicalizedNameComponents:'///foo'   
-     Filename canonicalizedNameComponents:'//foo//bar'   
+     Filename canonicalizedNameComponents:'/etc/../etc'
+     Filename canonicalizedNameComponents:'/home/cg/../'
+     Filename canonicalizedNameComponents:'/home/cg/../././'
+     Filename canonicalizedNameComponents:'./home/cg/../././'
+     Filename canonicalizedNameComponents:'/home/././cg/../././'
+     Filename canonicalizedNameComponents:'/home/././cg/././'
+     Filename canonicalizedNameComponents:'/home/cg/../../..'
+     Filename canonicalizedNameComponents:'cg/../../..'
+     Filename canonicalizedNameComponents:'/'
+     Filename canonicalizedNameComponents:'./'
+     Filename canonicalizedNameComponents:'/.'
+     Filename canonicalizedNameComponents:'/home/.'
+     Filename canonicalizedNameComponents:'/home'
+     Filename canonicalizedNameComponents:'/home/../..'
+     Filename canonicalizedNameComponents:'//foo'
+     Filename canonicalizedNameComponents:'///foo'
+     Filename canonicalizedNameComponents:'//foo//bar'
     "
 !
 
 components:aString
-    "separate the pathName given by aString into 
+    "separate the pathName given by aString into
      a collection containing the directory components and the file's name as
      the final component.
      If the argument names an absolute path, the first component will be the
@@ -1515,7 +1515,7 @@
     |sep f vol rest components|
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass components:aString
+	^ ConcreteClass components:aString
     ].
 
     "/ the following works on Unix & MSDOS (but not on openVMS)
@@ -1526,68 +1526,68 @@
     f := aString asFilename.
     vol := f volume.
     vol size ~~ 0 ifTrue:[
-        rest := f localPathName.
+	rest := f localPathName.
     ] ifFalse:[
-        rest := aString
+	rest := aString
     ].
 
     components := rest asCollectionOfSubstringsSeparatedBy:sep.
     (rest startsWith:sep) ifTrue:[
-        "first was a separator - root directory - restore"
-        (rest size > 1 and:[rest second = sep and:[vol isEmptyOrNil]]) ifTrue:[
-            "keep \\ for windows network paths"
-            components at:1 put:(String with:sep with:sep).
-        ] ifFalse:[
-            components at:1 put:sep asString.
-        ].
+	"first was a separator - root directory - restore"
+	(rest size > 1 and:[rest second = sep and:[vol isEmptyOrNil]]) ifTrue:[
+	    "keep \\ for windows network paths"
+	    components at:1 put:(String with:sep with:sep).
+	] ifFalse:[
+	    components at:1 put:sep asString.
+	].
     ].
     components := components select:[:each| each notEmpty].
 
     "/ prepend volume to first component (the root directory)
     vol size ~~ 0 ifTrue:[
-        components at:1 put:(vol , (components at:1)).
+	components at:1 put:(vol , (components at:1)).
     ].
     ^ components
 
     "
-     Filename components:'/foo/bar/baz'      
-     Filename components:'/'     
-     Filename components:'//'     
-     Filename components:'foo/bar/baz'  
-     Filename components:'foo/bar'  
-     Filename components:'foo'     
-     Filename components:'/foo'     
-     Filename components:'//foo'     
-     Filename components:''     
-
-     Filename components:'\'     
-     Filename components:'\foo'     
-     Filename components:'\foo\'     
-     Filename components:'\foo\bar'     
-     Filename components:'\foo\bar\'     
-     Filename components:'c:'        
-     Filename components:'c:\'       
-     Filename components:'c:\foo'      
-     Filename components:'c:\foo\'     
-     Filename components:'c:\foo\bar'     
-     Filename components:'c:\foo\bar\'  
-     Filename components:'\\idefix'     
-     Filename components:'\\idefix\home'     
-     Filename components:'\\idefix\home\bar'    
+     Filename components:'/foo/bar/baz'
+     Filename components:'/'
+     Filename components:'//'
+     Filename components:'foo/bar/baz'
+     Filename components:'foo/bar'
+     Filename components:'foo'
+     Filename components:'/foo'
+     Filename components:'//foo'
+     Filename components:''
+
+     Filename components:'\'
+     Filename components:'\foo'
+     Filename components:'\foo\'
+     Filename components:'\foo\bar'
+     Filename components:'\foo\bar\'
+     Filename components:'c:'
+     Filename components:'c:\'
+     Filename components:'c:\foo'
+     Filename components:'c:\foo\'
+     Filename components:'c:\foo\bar'
+     Filename components:'c:\foo\bar\'
+     Filename components:'\\idefix'
+     Filename components:'\\idefix\home'
+     Filename components:'\\idefix\home\bar'
     "
 
     "Modified: / 24.9.1998 / 19:10:52 / cg"
 !
 
 nameFromComponents:aCollectionOfDirectoryNames
-    "return a filenameString from components given in aCollectionOfDirectoryNames. 
+    "return a filenameString from components given in aCollectionOfDirectoryNames.
      If the first component is the name of the root directory (i.e. '/'),
      an absolute path-string is returned."
 
     |sep s|
 
     self isAbstract ifTrue:[
-        ^ ConcreteClass nameFromComponents:aCollectionOfDirectoryNames
+	^ ConcreteClass nameFromComponents:aCollectionOfDirectoryNames
     ].
 
     "/ fallBack - works on Unix & MSDOS
@@ -1595,50 +1595,50 @@
     sep := self separatorString.
     s := ''.
     aCollectionOfDirectoryNames keysAndValuesDo:[:index :component |
-        index == 1 ifTrue:[
-            s := component.
-        ] ifFalse:[
-            (index == 2 and:[ (s endsWith:sep) ]) ifTrue:[
-                s := s , component
-            ] ifFalse:[
-                s := s , sep , component
-            ]
-        ].
+	index == 1 ifTrue:[
+	    s := component.
+	] ifFalse:[
+	    (index == 2 and:[ (s endsWith:sep) ]) ifTrue:[
+		s := s , component
+	    ] ifFalse:[
+		s := s , sep , component
+	    ]
+	].
     ].
     ^ s
 
     "
-     Filename nameFromComponents:#('/' 'foo' 'bar' 'baz')  
-     Filename nameFromComponents:#('foo' 'bar' 'baz')  
-     Filename nameFromComponents:#('/') 
+     Filename nameFromComponents:#('/' 'foo' 'bar' 'baz')
+     Filename nameFromComponents:#('foo' 'bar' 'baz')
+     Filename nameFromComponents:#('/')
 
      |comps|
      comps := Filename components:'/foo/bar/baz'.
-     Filename nameFromComponents:comps        
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'\foo\bar\baz'.
-     Filename nameFromComponents:comps          
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'c:\foo\bar\baz'.
-     Filename nameFromComponents:comps            
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'foo\bar\baz'.
-     Filename nameFromComponents:comps            
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'foo'.
-     Filename nameFromComponents:comps            
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'\'.
-     Filename nameFromComponents:comps            
+     Filename nameFromComponents:comps
 
      |comps|
      comps := Filename components:'c:\'.
-     Filename nameFromComponents:comps            
+     Filename nameFromComponents:comps
     "
 
     "Modified: 8.9.1997 / 00:23:16 / cg"
@@ -1656,12 +1656,12 @@
 
      |rslt|
 
-     rslt := 
-        Filename 
-            readingFile:'/etc/passwd'
-            do:[:s |
-                s nextLine
-            ]. 
+     rslt :=
+	Filename
+	    readingFile:'/etc/passwd'
+	    do:[:s |
+		s nextLine
+	    ].
      Transcript showCR:rslt.
     "
 
@@ -1671,22 +1671,22 @@
      |rslt|
 
      rslt :=
-        Filename 
-            readingFile:'/etc/passwd' 
-            do:
-                [:s |
-                    |shells|
-
-                    shells := Bag new.
-                    s linesDo:
-                        [:line |
-                            |parts|
-
-                            parts := line asCollectionOfSubstringsSeparatedBy:$:.
-                            shells add:(parts seventh).
-                        ].
-                    shells contents
-                ].           
+	Filename
+	    readingFile:'/etc/passwd'
+	    do:
+		[:s |
+		    |shells|
+
+		    shells := Bag new.
+		    s linesDo:
+			[:line |
+			    |parts|
+
+			    parts := line asCollectionOfSubstringsSeparatedBy:$:.
+			    shells add:(parts seventh).
+			].
+		    shells contents
+		].
      Transcript showCR:rslt.
     "
 ! !
@@ -1705,9 +1705,9 @@
     ^ self isWritable
 
     "
-     '/foo/bar' asFilename canBeWritten 
-     '/tmp' asFilename canBeWritten   
-     'Makefile' asFilename canBeWritten   
+     '/foo/bar' asFilename canBeWritten
+     '/tmp' asFilename canBeWritten
+     'Makefile' asFilename canBeWritten
     "
 !
 
@@ -1727,17 +1727,17 @@
     string := self asString.
     idx := string lastIndexOf:$..
     idx > 1 ifTrue:[
-        ^ string copyFrom:idx
+	^ string copyFrom:idx
     ].
     ^ nil
 
     "
-     'foo.html' asFilename extension   
-     'foo.bar' asFilename extension       
-     'foo.bar.baz' asFilename extension   
-     'foo.' asFilename extension          
-     'foo' asFilename extension           
-     '.login' asFilename extension           
+     'foo.html' asFilename extension
+     'foo.bar' asFilename extension
+     'foo.bar.baz' asFilename extension
+     'foo.' asFilename extension
+     'foo' asFilename extension
+     '.login' asFilename extension
     "
 ! !
 
@@ -1755,11 +1755,11 @@
     |str|
 
     self species == aFilename species ifTrue:[
-        str := aFilename asString.
-        self species isCaseSensitive ifTrue:[
-            ^ nameString = str
-        ].
-        ^ nameString sameAs:str
+	str := aFilename asString.
+	self species isCaseSensitive ifTrue:[
+	    ^ nameString = str
+	].
+	^ nameString sameAs:str
     ].
     ^ false
 !
@@ -1777,32 +1777,32 @@
     self fileSize > f2 fileSize ifTrue:[^ false].
 
     [
-        s1 := self readStream.
-        s2 := f2 readStream.
-        s1 binary.
-        s2 binary.
-
-        buffer1 := ByteArray new:bufferSize.
-        buffer2 := ByteArray new:bufferSize.
-
-        [s1 atEnd] whileFalse:[
-            n := s1 nextBytes:bufferSize into:buffer1 startingAt:1.
-            n == 0 ifTrue:[
-                "/ receiver shorter.
-                ^ true
-            ].
-            (s2 nextBytes:n into:buffer2 startingAt:1) ~~ n ifTrue:[
-                "/ aFilename shorter
-                ^ false
-            ].
-            buffer1 ~= buffer2 ifTrue:[
-                ^ false
-            ]
-        ].
-        "/ receiver shorter or same size.
+	s1 := self readStream.
+	s2 := f2 readStream.
+	s1 binary.
+	s2 binary.
+
+	buffer1 := ByteArray new:bufferSize.
+	buffer2 := ByteArray new:bufferSize.
+
+	[s1 atEnd] whileFalse:[
+	    n := s1 nextBytes:bufferSize into:buffer1 startingAt:1.
+	    n == 0 ifTrue:[
+		"/ receiver shorter.
+		^ true
+	    ].
+	    (s2 nextBytes:n into:buffer2 startingAt:1) ~~ n ifTrue:[
+		"/ aFilename shorter
+		^ false
+	    ].
+	    buffer1 ~= buffer2 ifTrue:[
+		^ false
+	    ]
+	].
+	"/ receiver shorter or same size.
     ] ensure:[
-        s1 notNil ifTrue:[s1 close]. 
-        s2 notNil ifTrue:[s2 close]. 
+	s1 notNil ifTrue:[s1 close].
+	s2 notNil ifTrue:[s2 close].
     ].
     ^ true
 
@@ -1905,7 +1905,10 @@
     "return an integer useful as a hash-key"
 
     self species isCaseSensitive ifFalse:[
-        ^ nameString asUppercase hash   
+	"/ asLowercase is slightly better:
+	"/ it never converts single-byte strings to double one's,
+	"/ whereas asUppercase might (for umlaut-y)
+	^ nameString asUppercase hash
     ].
     ^ nameString hash
 !
@@ -1922,8 +1925,8 @@
     ^ self contentsIsPrefixOf:f2.
 
     "
-     'Make.proto' asFilename sameContentsAs:'Makefile'  
-     'Make.proto' asFilename sameContentsAs:'Make.proto'   
+     'Make.proto' asFilename sameContentsAs:'Makefile'
+     'Make.proto' asFilename sameContentsAs:'Make.proto'
     "
 
     "
@@ -2039,12 +2042,12 @@
     ^ self species components:self name
 
     "
-     '.' asFilename asAbsoluteFilename components 
-     'Makefile' asFilename asAbsoluteFilename components     
-    "
-!
-
-makeLegalFilename 
+     '.' asFilename asAbsoluteFilename components
+     'Makefile' asFilename asAbsoluteFilename components
+    "
+!
+
+makeLegalFilename
     "convert the receivers name to be a legal filename.
      This removes/replaces invalid characters and/or compresses
      the name as required by the OS.
@@ -2057,13 +2060,13 @@
     "
     nameString := nameString copyReplaceAll:(Character space) with:$_ ifNone:nameString.
     "
-     need more - especially on SYS5.3 type systems, 
+     need more - especially on SYS5.3 type systems,
      we may want to contract the fileName to 14 characters.
     "
     ^ self
 
     "
-     'hello world' asFilename makeLegalFilename 
+     'hello world' asFilename makeLegalFilename
     "
 
     "Modified: / 20.7.1998 / 13:16:51 / cg"
@@ -2090,13 +2093,13 @@
      may be changed in the near future, to raise an exception instead.
      So users of this method better test for existing directory before."
 
-    self recursiveDirectoryContentsDo:[:eachFileOrDirectoryName | 
-        |eachFileOrDirectory|
-
-        eachFileOrDirectory := self construct:eachFileOrDirectoryName.
-        eachFileOrDirectory isDirectory ifTrue:[
-            aBlock value:eachFileOrDirectory
-        ]
+    self recursiveDirectoryContentsDo:[:eachFileOrDirectoryName |
+	|eachFileOrDirectory|
+
+	eachFileOrDirectory := self construct:eachFileOrDirectoryName.
+	eachFileOrDirectory isDirectory ifTrue:[
+	    aBlock value:eachFileOrDirectory
+	]
     ].
 
     "
@@ -2114,9 +2117,9 @@
     here := self.
     parent := here directory.
     [here notNil and:[parent ~= here]] whileTrue:[
-        aBlock value:parent.    
-        here := parent.
-        parent := here directory.
+	aBlock value:parent.
+	here := parent.
+	parent := here directory.
     ].
 
     "
@@ -2130,10 +2133,10 @@
     |collection|
 
     collection := OrderedCollection new.
-    self directoryContentsAsFilenamesDo:[:eachFileOrDirectory | 
-        eachFileOrDirectory isDirectory ifTrue:[
-            collection add:eachFileOrDirectory.
-        ].
+    self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
+	eachFileOrDirectory isDirectory ifTrue:[
+	    collection add:eachFileOrDirectory.
+	].
     ].
 
     ^ collection
@@ -2155,9 +2158,9 @@
      So users of this method better test for existing directory before."
 
     self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
-        eachFileOrDirectory isDirectory ifTrue:[
-            aBlock value:eachFileOrDirectory
-        ]
+	eachFileOrDirectory isDirectory ifTrue:[
+	    aBlock value:eachFileOrDirectory
+	]
     ].
 
     "
@@ -2177,7 +2180,7 @@
      #directoryContentsDo:, which enumerates strings."
 
     self directoryContentsDo:[:entry |
-        aBlock value:(self construct:entry).
+	aBlock value:(self construct:entry).
     ]
 
     "
@@ -2204,25 +2207,25 @@
     s := DirectoryStream directoryNamed:self osNameForDirectoryContents.
     "check for nil, in order to allow to proceed from an OpenError"
     s notNil ifTrue:[
-        [
-            [s atEnd] whileFalse:[
-                |fn|
-
-                fn := s nextLine.
-                (fn ~= '.' and:[fn ~= '..']) ifTrue:[        
-                    aBlock value:fn
-                ].
-            ].
-        ] ensure:[
-            s close.
-        ].
+	[
+	    [s atEnd] whileFalse:[
+		|fn|
+
+		fn := s nextLine.
+		(fn ~= '.' and:[fn ~= '..']) ifTrue:[
+		    aBlock value:fn
+		].
+	    ].
+	] ensure:[
+	    s close.
+	].
     ].
 
     "
      '.' asFilename directoryContentsDo:[:fn | Transcript showCR:fn].
      'doeSnotExIST' asFilename directoryContentsDo:[:fn | Transcript showCR:fn].
      [
-        'doeSnotExIST' asFilename directoryContentsDo:[:fn | Transcript showCR:fn].
+	'doeSnotExIST' asFilename directoryContentsDo:[:fn | Transcript showCR:fn].
      ] on:OpenError do:[:ex| ex proceed]
     "
 
@@ -2236,10 +2239,10 @@
     |collection|
 
     collection := OrderedCollection new.
-    self directoryContentsAsFilenamesDo:[:eachFileName | 
-        eachFileName isRegularFile ifTrue:[
-            collection add:eachFileName
-        ].
+    self directoryContentsAsFilenamesDo:[:eachFileName |
+	eachFileName isRegularFile ifTrue:[
+	    collection add:eachFileName
+	].
     ].
     ^ collection.
 
@@ -2253,8 +2256,8 @@
 filesDo:aBlock
     "evaluate aBlock for all files contained in the directory represented by the receiver."
 
-    ^ self directoryContentsAsFilenamesDo:[:eachFileOrDirectory | 
-        eachFileOrDirectory isRegularFile ifTrue:[ aBlock value: eachFileOrDirectory].
+    ^ self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
+	eachFileOrDirectory isRegularFile ifTrue:[ aBlock value: eachFileOrDirectory].
     ].
 
     "
@@ -2265,7 +2268,7 @@
     "Modified: / 29-05-2007 / 12:02:46 / cg"
 !
 
-recursiveDirectoryContentsAsFilenamesDo:aBlock 
+recursiveDirectoryContentsAsFilenamesDo:aBlock
     "evaluate aBlock for all files and directories found under the receiver.
      The block is invoked with the filenames as argument.
      The walk is bread-first.
@@ -2274,17 +2277,17 @@
      Warning: this may take a long time to execute (especially with deep and/or remote fileSystems)."
 
     self recursiveDirectoryContentsDo:[:relFn |
-        aBlock value:(self construct:relFn)
+	aBlock value:(self construct:relFn)
     ].
 
     "
-     '.' asFilename recursiveDirectoryContentsAsFilenamesDo:[:f | Transcript showCR:f] 
+     '.' asFilename recursiveDirectoryContentsAsFilenamesDo:[:f | Transcript showCR:f]
     "
 
     "Modified: / 12-09-2010 / 15:43:22 / cg"
 !
 
-recursiveDirectoryContentsDo:aBlock 
+recursiveDirectoryContentsDo:aBlock
     "evaluate aBlock for all files and directories found under the receiver.
      The block is invoked with the relative filenames as string-argument.
      The walk is bread-first.
@@ -2295,7 +2298,7 @@
     self recursiveDirectoryContentsDo:aBlock directoryPrefix:''
 
     "
-     '.' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f] 
+     '.' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f]
     "
 
     "Modified: / 12-09-2010 / 15:43:22 / cg"
@@ -2315,32 +2318,32 @@
     fileNames := OrderedCollection new.
     dirNames := OrderedCollection new.
     self directoryContentsDo:[:f | |t|
-        t := self construct:f.
-        t isDirectory ifTrue:[
-            t isSymbolicLink ifFalse:[
-                dirNames add:f
-            ]
-        ] ifFalse:[
-            fileNames add:f
-        ]
+	t := self construct:f.
+	t isDirectory ifTrue:[
+	    t isSymbolicLink ifFalse:[
+		dirNames add:f
+	    ]
+	] ifFalse:[
+	    fileNames add:f
+	]
     ].
 
     aPrefix size > 0 ifTrue:[
-        p := aPrefix , self separator
+	p := aPrefix , self separator
     ] ifFalse:[
-        p := ''
+	p := ''
     ].
 
     fileNames do:[:aFile | aBlock value:(p , aFile)].
     dirNames do:[:dN |
-        aBlock value:(p , dN).
-        (self construct:dN)
-            recursiveDirectoryContentsDo:aBlock directoryPrefix:(p , dN)
+	aBlock value:(p , dN).
+	(self construct:dN)
+	    recursiveDirectoryContentsDo:aBlock directoryPrefix:(p , dN)
     ].
 
     "
-     '.' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f] 
-     '/etc' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f] 
+     '.' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f]
+     '/etc' asFilename recursiveDirectoryContentsDo:[:f | Transcript showCR:f]
     "
 !
 
@@ -2354,7 +2357,7 @@
      So users of this method better test for existing directory before."
 
     self isDirectory ifTrue:[
-        aBlock value:self.
+	aBlock value:self.
     ].
     self allDirectoriesDo:aBlock.
 
@@ -2377,14 +2380,14 @@
     errNo := OperatingSystem lastErrorNumber.
     errString := OperatingSystem lastErrorString.
     errString size == 0 ifTrue:[
-        errString := ''.
+	errString := ''.
     ] ifFalse:[
-        errString := ' (' , errString , ')'
+	errString := ' (' , errString , ')'
     ].
 
     ^ OperatingSystem accessDeniedErrorSignal
-        raiseRequestWith:filename ? self
-        errorString:(' : ' , (filename ? self) asString , errString)
+	raiseRequestWith:filename ? self
+	errorString:(' : ' , (filename ? self) asString , errString)
 
     "Modified: / 26.9.1999 / 16:11:44 / cg"
 !
@@ -2395,18 +2398,18 @@
     "report an error that some file could not be created"
 
     ^ OperatingSystem accessDeniedErrorSignal
-        raiseRequestWith:filename?self
-        errorString:(' - cannot create/write file: "%1"' bindWith:(filename ? self) asString)
-!
-
-fileNotFoundError:filename 
+	raiseRequestWith:filename?self
+	errorString:(' - cannot create/write file: "%1"' bindWith:(filename ? self) asString)
+!
+
+fileNotFoundError:filename
     "{ Pragma: +optSpace }"
 
     "report an error that some file was not found"
 
     ^ OperatingSystem fileNotFoundErrorSignal
-        raiseRequestWith:filename?self
-        errorString:('file not found: ' , (filename ? self) asString)
+	raiseRequestWith:filename?self
+	errorString:('file not found: ' , (filename ? self) asString)
 !
 
 removeError:filename
@@ -2415,8 +2418,8 @@
     "report an error that some file could not be removed"
 
     ^ OperatingSystem accessDeniedErrorSignal
-        raiseRequestWith:filename?self
-        errorString:('cannot remove: ' , (filename?self) asString)
+	raiseRequestWith:filename?self
+	errorString:('cannot remove: ' , (filename?self) asString)
 !
 
 reportError:string with:filename
@@ -2425,8 +2428,8 @@
     "report an error"
 
     ^ OsError
-        raiseRequestWith:filename?self
-        errorString:string
+	raiseRequestWith:filename?self
+	errorString:string
 ! !
 
 !Filename methodsFor:'file access'!
@@ -2457,7 +2460,7 @@
      s nextPutAll:'abcdef'.
      s close.
 
-     '/tmp/foo' asFilename contents   
+     '/tmp/foo' asFilename contents
     "
 !
 
@@ -2478,8 +2481,8 @@
      s := '/tmp/foo' asFilename existingReadWriteStream.
      s nextPutAll:'abcdef'; close.
 
-     '/tmp/foo' asFilename contents inspect.     
-     '/tmp/foo' asFilename remove      
+     '/tmp/foo' asFilename contents inspect.
+     '/tmp/foo' asFilename remove
     "
 !
 
@@ -2501,7 +2504,7 @@
      s nextPutAll:'12345'.
      s close.
 
-     '/tmp/foo' asFilename contents   
+     '/tmp/foo' asFilename contents
     "
 !
 
@@ -2520,7 +2523,7 @@
      s close.
 
 
-     '/tmp/foo' asFilename contents   
+     '/tmp/foo' asFilename contents
     "
 !
 
@@ -2549,12 +2552,12 @@
      s nextPutAll:'1234567890'.
      s close.
 
-     s := '/tmp/foo' asFilename readWriteStream. 
+     s := '/tmp/foo' asFilename readWriteStream.
      s nextPutAll:'abcdef'.
      s close.
 
-     '/tmp/foo' asFilename contents      
-     '/tmp/foo' asFilename remove      
+     '/tmp/foo' asFilename contents
+     '/tmp/foo' asFilename remove
     "
 !
 
@@ -2566,7 +2569,7 @@
     ^ FileStream newFileForWritingNamed:(self osNameForAccess)
 
     "
-     '/tmp/foo' asFilename writeStream 
+     '/tmp/foo' asFilename writeStream
     "
 
     "
@@ -2580,7 +2583,7 @@
      s nextPutAll:'12345'.
      s close.
 
-     '/tmp/foo' asFilename contents  
+     '/tmp/foo' asFilename contents
     "
 ! !
 
@@ -2596,7 +2599,7 @@
      instead of an exception when an error occurs."
 
     ^ [
-        FileStream appendingOldFileNamed:(self osNameForAccess)
+	FileStream appendingOldFileNamed:(self osNameForAccess)
       ] on:FileStream openErrorSignal do:[:ex| nil].
 !
 
@@ -2610,7 +2613,7 @@
      instead of an exception when an error occurs."
 
     ^ [
-         FileStream newFileNamed:(self osNameForAccess)
+	 FileStream newFileNamed:(self osNameForAccess)
     ] on:FileStream openErrorSignal do:[:ex|nil].
 !
 
@@ -2623,12 +2626,12 @@
      instead of an exception when an error occurs."
 
     ^ [
-        FileStream readonlyFileNamed:(self osNameForAccess)
+	FileStream readonlyFileNamed:(self osNameForAccess)
     ] on:FileStream openErrorSignal do:[:ex|nil].
 
     "
-     '/tmp/foo' asFilename readStreamOrNil 
-     '/tmp/foo' asFilename readStream 
+     '/tmp/foo' asFilename readStreamOrNil
+     '/tmp/foo' asFilename readStream
     "
 !
 
@@ -2642,7 +2645,7 @@
      instead of an exception when an error occurs."
 
     ^ [
-        FileStream fileNamed:(self osNameForAccess)
+	FileStream fileNamed:(self osNameForAccess)
     ] on:FileStream openErrorSignal do:[:ex|^ nil].
 !
 
@@ -2656,12 +2659,12 @@
      instead of an exception when an error occurs."
 
     ^ [
-        FileStream newFileForWritingNamed:(self osNameForAccess)
+	FileStream newFileForWritingNamed:(self osNameForAccess)
     ] on:FileStream openErrorSignal do:[:ex|^ nil].
 
 
     "
-     '/etc/foo' asFilename writeStreamOrNil 
+     '/etc/foo' asFilename writeStreamOrNil
     "
 ! !
 
@@ -2683,14 +2686,14 @@
      which is normally retrieved by Filename>>#accessRights."
 
     (OperatingSystem changeAccessModeOf:self osNameForFile to:opaqueData) ifFalse:[
-        ^ self accessDeniedError:self
+	^ self accessDeniedError:self
     ].
 
     "
      |rights|
 
-     rights := 'Make.proto' asFilename accessRights. 
-     'Make.proto' asFilename accessRights:rights. 
+     rights := 'Make.proto' asFilename accessRights.
+     'Make.proto' asFilename accessRights:rights.
     "
 
     "Modified: / 5.5.1999 / 13:41:21 / cg"
@@ -2706,10 +2709,10 @@
     osName := self osNameForFile.
     access := OperatingSystem accessModeOf:osName.
     aCollection do:[:accessSymbol |
-        access := access bitOr:(OperatingSystem accessMaskFor:accessSymbol).
+	access := access bitOr:(OperatingSystem accessMaskFor:accessSymbol).
     ].
     (OperatingSystem changeAccessModeOf:osName to:access) ifFalse:[
-        ^ self accessDeniedError:self
+	^ self accessDeniedError:self
     ]
 
     "
@@ -2800,10 +2803,10 @@
     osName := self osNameForFile.
     access := OperatingSystem accessModeOf:osName.
     aCollection do:[:accessSymbol |
-        access := access bitAnd:(OperatingSystem accessMaskFor:accessSymbol) bitInvert.
+	access := access bitAnd:(OperatingSystem accessMaskFor:accessSymbol) bitInvert.
     ].
     (OperatingSystem changeAccessModeOf:osName to:access) ifFalse:[
-        ^ self accessDeniedError:self
+	^ self accessDeniedError:self
     ].
 
     "
@@ -2819,20 +2822,20 @@
 symbolicAccessRights
     "return the access rights of the file as a aCollection of access symbols.
      The returned collection consists of symbols like:
-        #readUser, #writeGroup etc."
+	#readUser, #writeGroup etc."
 
     |access osName|
 
     osName := self osNameForFile.
     access := OperatingSystem accessModeOf:osName.
 
-    ^ 
-        #(  readUser writeUser executeUser
-            readGroup writeGroup executeGroup
-            readOthers writeOthers executeOthers
-          ) select:[:eachSymbolicAccessSymbol |
-                access bitTest:(OperatingSystem accessMaskFor:eachSymbolicAccessSymbol).
-            ].
+    ^
+	#(  readUser writeUser executeUser
+	    readGroup writeGroup executeGroup
+	    readOthers writeOthers executeOthers
+	  ) select:[:eachSymbolicAccessSymbol |
+		access bitTest:(OperatingSystem accessMaskFor:eachSymbolicAccessSymbol).
+	    ].
 
     "
      'Makefile' asFilename symbolicAccessRights
@@ -2844,24 +2847,24 @@
 symbolicAccessRights:aCollectionOfSymbols
     "set the access rights of the file given a aCollection of access symbols.
      The collection must consist of symbols like:
-        #readUser, #writeGroup etc."
+	#readUser, #writeGroup etc."
 
     |access osName|
 
     osName := self osNameForFile.
     access := aCollectionOfSymbols inject:0 into:[:bitsSoFar :eachSymbolicAccessSymbol |
-                bitsSoFar bitOr:(OperatingSystem accessMaskFor:eachSymbolicAccessSymbol)
-              ].
+		bitsSoFar bitOr:(OperatingSystem accessMaskFor:eachSymbolicAccessSymbol)
+	      ].
 
     (OperatingSystem changeAccessModeOf:osName to:access) ifFalse:[
-        ^ self accessDeniedError:self
+	^ self accessDeniedError:self
     ].
 
     "
      |rights|
 
-     rights := 'Makefile' asFilename symbolicAccessRights. 
-     'Makefile' asFilename symbolicAccessRights:(rights , #(executeOthers)). 
+     rights := 'Makefile' asFilename symbolicAccessRights.
+     'Makefile' asFilename symbolicAccessRights:(rights , #(executeOthers)).
     "
 
     "Modified: / 5.5.1999 / 13:41:21 / cg"
@@ -2877,23 +2880,23 @@
 
     inStream := self readStream.
     [
-        newNameOrStream isStream ifTrue:[
-            outStream := newNameOrStream.
-        ] ifFalse:[
-            outStream := outStreamToClose := newNameOrStream asFilename appendingWriteStream.
-        ].
-
-        inStream binary.
-        outStream binary.
-
-        [
-            inStream copyToEndInto:outStream.
-        ] on:OsError do:[:ex|
-            ^ self fileCreationError:newNameOrStream
-        ]
+	newNameOrStream isStream ifTrue:[
+	    outStream := newNameOrStream.
+	] ifFalse:[
+	    outStream := outStreamToClose := newNameOrStream asFilename appendingWriteStream.
+	].
+
+	inStream binary.
+	outStream binary.
+
+	[
+	    inStream copyToEndInto:outStream.
+	] on:OsError do:[:ex|
+	    ^ self fileCreationError:newNameOrStream
+	]
     ] ensure:[
-        inStream close.
-        outStreamToClose notNil ifTrue:[outStreamToClose close].
+	inStream close.
+	outStreamToClose notNil ifTrue:[outStreamToClose close].
     ].
 
     "
@@ -2927,29 +2930,29 @@
 
     inStream := self readStream.
     inStream isNil ifTrue:[
-        "open failed, but somenone did a proceed for the OpenError.
-         Ignore this file but continue in order to copy the rest when
-         doing a recursive copy"
-        ^ self.
+	"open failed, but somenone did a proceed for the OpenError.
+	 Ignore this file but continue in order to copy the rest when
+	 doing a recursive copy"
+	^ self.
     ].
 
     [
-        newNameAlreadyExists := newName exists.
-        outStream := newName writeStream.
-        newNameAlreadyExists ifFalse:[
-            [
-                "would be nice to keep the access rights of the original test suite"    
-                newName accessRights:self accessRights.
-            ] on:OperatingSystem accessDeniedErrorSignal do:[:ex|
-                "ignore the error - may occure when copying to a network drive"
-            ].            
-        ].
-        inStream binary; buffered:false.
-        outStream binary; buffered:false.
-        inStream copyToEndInto:outStream.
+	newNameAlreadyExists := newName exists.
+	outStream := newName writeStream.
+	newNameAlreadyExists ifFalse:[
+	    [
+		"would be nice to keep the access rights of the original test suite"
+		newName accessRights:self accessRights.
+	    ] on:OperatingSystem accessDeniedErrorSignal do:[:ex|
+		"ignore the error - may occure when copying to a network drive"
+	    ].
+	].
+	inStream binary; buffered:false.
+	outStream binary; buffered:false.
+	inStream copyToEndInto:outStream.
     ] ensure:[
-        inStream close.
-        outStream notNil ifTrue:[outStream close].
+	inStream close.
+	outStream notNil ifTrue:[outStream close].
     ].
 
     "
@@ -2971,26 +2974,26 @@
 
     "Contents is not copied if newName represent same file as me."
     outStream isFileStream ifTrue:[
-        outStream fileName asAbsoluteFilename = self asAbsoluteFilename ifTrue: [ ^ self ].
+	outStream fileName asAbsoluteFilename = self asAbsoluteFilename ifTrue: [ ^ self ].
     ].
 
     inStream := self readStream.
     [
-        inStream binary"; buffered:false".
-        resetBinary := false.
-        outStream isBinary ifFalse:[
-            outStream binary.
-            resetBinary := true.
-        ].
-        inStream copyToEndInto:outStream.
+	inStream binary"; buffered:false".
+	resetBinary := false.
+	outStream isBinary ifFalse:[
+	    outStream binary.
+	    resetBinary := true.
+	].
+	inStream copyToEndInto:outStream.
     ] ensure:[
-        inStream close.
-        resetBinary ifTrue:[
-            outStream text.
-        ].
+	inStream close.
+	resetBinary ifTrue:[
+	    outStream text.
+	].
     ].
 
-    "   
+    "
      |out|
      out := FileStream newTemporary.
      'Make.proto' asFilename copyToStream:out.
@@ -3006,17 +3009,17 @@
     |writeStream|
 
     self exists ifTrue:[
-        OperatingSystem accessDeniedErrorSignal
-            raiseRequestWith:self
-            errorString:(' - file exists: ' , self asString).
-        ^ self
-    ].  
+	OperatingSystem accessDeniedErrorSignal
+	    raiseRequestWith:self
+	    errorString:(' - file exists: ' , self asString).
+	^ self
+    ].
 
     FileStream openErrorSignal handle:[:ex|
-        self fileCreationError:self.
-        ^ self
-    ] do:[    
-        writeStream := self newReadWriteStream.
+	self fileCreationError:self.
+	^ self
+    ] do:[
+	writeStream := self newReadWriteStream.
     ].
     writeStream close.
 !
@@ -3028,7 +3031,7 @@
     OperatingSystem createSymbolicLinkFrom:linkFilenameString to:self pathName.
 
     "
-        '/tmp/link' asFilename makeSymbolicLinkTo:'bla'
+	'/tmp/link' asFilename makeSymbolicLinkTo:'bla'
     "
 !
 
@@ -3043,13 +3046,13 @@
      Raises an exception if not successful"
 
     (self basicMakeDirectory) ifFalse:[
-        "/
-        "/ could have existed before ...
-        "/
-        (self exists and:[self isDirectory]) ifFalse:[
-            self fileCreationError:self.
-            ^ false
-        ]
+	"/
+	"/ could have existed before ...
+	"/
+	(self exists and:[self isDirectory]) ifFalse:[
+	    self fileCreationError:self.
+	    ^ false
+	]
     ].
     ^ true
 
@@ -3062,15 +3065,15 @@
      Raise an exception if not successful.
      (Notice, that a rename is tried first, in case of non-cross device move)"
 
-    [self renameTo:newName] 
-        on:OsError 
-        do:[:ex |
-            ex creator == OperatingSystem fileNotFoundErrorSignal ifTrue:[
-                ex reject
-            ].
-            self safeCopyTo:newName. 
-            self remove
-        ].
+    [self renameTo:newName]
+	on:OsError
+	do:[:ex |
+	    ex creator == OperatingSystem fileNotFoundErrorSignal ifTrue:[
+		ex reject
+	    ].
+	    self safeCopyTo:newName.
+	    self remove
+	].
 
     "
      |f s|
@@ -3101,18 +3104,18 @@
 
     |newName|
 
-    newName := newNameArg asFilename.    
-    [self renameTo:newName] 
-        on:(OSErrorHolder inappropriateReferentSignal) 
-        do:[:ex |
-            "handle renames accross device boundaries (Unix. cross device link)"
-            self isDirectory ifTrue:[
-                self recursiveMoveDirectoryTo:newName.
-            ] ifFalse:[
-                self safeCopyTo:newName.
-                self remove.
-            ].
-        ].
+    newName := newNameArg asFilename.
+    [self renameTo:newName]
+	on:(OSErrorHolder inappropriateReferentSignal)
+	do:[:ex |
+	    "handle renames accross device boundaries (Unix. cross device link)"
+	    self isDirectory ifTrue:[
+		self recursiveMoveDirectoryTo:newName.
+	    ] ifFalse:[
+		self safeCopyTo:newName.
+		self remove.
+	    ].
+	].
 
     "
      |f s|
@@ -3142,34 +3145,34 @@
 
      Raises an exception if not successful.
      Do not resolve symbolic links.
-     If a whole directory is to be copied and the destination directory 
+     If a whole directory is to be copied and the destination directory
      does not exist, it will be created."
 
     |ok destinationFilename|
 
     destinationFilename := destination asFilename.
     self isDirectory ifFalse:[
-        destinationFilename isDirectory ifTrue:[
-            destinationFilename := destinationFilename construct:self baseName.
-        ].
-        self copyTo:destinationFilename.
-        ^ self.
+	destinationFilename isDirectory ifTrue:[
+	    destinationFilename := destinationFilename construct:self baseName.
+	].
+	self copyTo:destinationFilename.
+	^ self.
     ].
 
     "/ typically, an 'cp -r' is faster;
     "/ however, if the command fails (or the OS does not support it),
     "/ fallBack doing a manual directory walk.
 
-    ok := OperatingSystem 
-            recursiveCopyDirectory:(self osNameForDirectory)
-            to:(destinationFilename osNameForDirectory).
+    ok := OperatingSystem
+	    recursiveCopyDirectory:(self osNameForDirectory)
+	    to:(destinationFilename osNameForDirectory).
 
     ok ifFalse:[
-        self recursiveCopyWithoutOSCommandTo:destinationFilename
+	self recursiveCopyWithoutOSCommandTo:destinationFilename
     ].
 
     "
-        '.' asFilename recursiveCopyTo:'/tmp/xxx'.
+	'.' asFilename recursiveCopyTo:'/tmp/xxx'.
     "
 
     "Created: / 05-05-1999 / 13:35:01 / cg"
@@ -3184,7 +3187,7 @@
      Raises an exception if not successful.
 
      Do not resolve symbolic links.
-     If a whole directory is to be copied and the destination directory 
+     If a whole directory is to be copied and the destination directory
      does not exist, it will be created."
 
     |destinationFilename|
@@ -3192,32 +3195,32 @@
     destinationFilename := destination asFilename.
 
     self isDirectory ifTrue:[
-        destinationFilename exists ifFalse:[
-            destinationFilename makeDirectory.
-            destinationFilename accessRights:self accessRights.
-        ].
-
-        self directoryContents do:[:aFilenameString |
-            |src dst|
-
-            src := self construct:aFilenameString.
-            dst := destinationFilename construct:aFilenameString.
-
-            src isDirectory ifTrue:[
-                src recursiveCopyWithoutOSCommandTo:dst
-            ] ifFalse:[src isSymbolicLink ifTrue:[                    
-                dst
-                    remove;
-                    createAsSymbolicLinkTo:src linkInfo path.
-            ] ifFalse:[
-                src copyTo:dst.
-            ]].
-        ].
+	destinationFilename exists ifFalse:[
+	    destinationFilename makeDirectory.
+	    destinationFilename accessRights:self accessRights.
+	].
+
+	self directoryContents do:[:aFilenameString |
+	    |src dst|
+
+	    src := self construct:aFilenameString.
+	    dst := destinationFilename construct:aFilenameString.
+
+	    src isDirectory ifTrue:[
+		src recursiveCopyWithoutOSCommandTo:dst
+	    ] ifFalse:[src isSymbolicLink ifTrue:[
+		dst
+		    remove;
+		    createAsSymbolicLinkTo:src linkInfo path.
+	    ] ifFalse:[
+		src copyTo:dst.
+	    ]].
+	].
     ] ifFalse:[
-        destinationFilename isDirectory ifTrue:[
-            destinationFilename := destinationFilename construct:self baseName.
-        ].
-        self copyTo:destinationFilename.
+	destinationFilename isDirectory ifTrue:[
+	    destinationFilename := destinationFilename construct:self baseName.
+	].
+	self copyTo:destinationFilename.
     ]
 
     "
@@ -3234,7 +3237,7 @@
      Raises an exception if not successful."
 
     (OperatingSystem recursiveCreateDirectory:(self osNameForDirectory)) ifFalse:[
-        ^ self fileCreationError:self
+	^ self fileCreationError:self
     ]
 
     "Created: / 27.11.1995 / 23:36:40 / cg"
@@ -3247,12 +3250,12 @@
      Raise an exception if not successful.
      (Notice, that a rename is tried first, in case of non-cross device move)"
 
-    [self renameTo:newName] 
-        on:OsError 
-        do:[ 
-            self recursiveCopyTo:newName.
-            self recursiveRemove
-        ].
+    [self renameTo:newName]
+	on:OsError
+	do:[
+	    self recursiveCopyTo:newName.
+	    self recursiveRemove
+	].
 !
 
 recursiveRemove
@@ -3263,26 +3266,26 @@
     |ok|
 
     "/ typically, an 'rm -rf' is faster and removes better;
-    "/ however, if the command fails (or the OS does not support it), 
+    "/ however, if the command fails (or the OS does not support it),
     "/ fallBack doing a manual directory walk.
 
     ok := OperatingSystem recursiveRemoveDirectory:(self osNameForDirectory).
     ok ifFalse:[
-        self recursiveRemoveWithoutOSCommand
+	self recursiveRemoveWithoutOSCommand
     ].
 
     "
      'foo' asFilename makeDirectory.
      'foo/bar' asFilename writeStream close.
      ('foo' asFilename remove) ifFalse:[
-        Transcript showCR:'could not remove foo'
+	Transcript showCR:'could not remove foo'
      ]
     "
     "
      'foo' asFilename makeDirectory.
      'foo/bar' asFilename writeStream close.
      ('foo' asFilename recursiveRemove) ifFalse:[
-        Transcript showCR:'could not remove foo'
+	Transcript showCR:'could not remove foo'
      ]
     "
 
@@ -3299,27 +3302,27 @@
     |files|
 
     self isDirectory ifTrue:[
-        (files := self directoryContents) size > 0 ifTrue:[
-            files do:[:aFilenameString |
-                |f|
-
-                f := self construct:aFilenameString.
-                Error handle:[:ex |
-                    f isDirectory ifFalse:[ ex reject ].
-
-                    f recursiveRemoveAll.
-                    f removeDirectory
-                ] do:[
-                    f remove
-                ].
+	(files := self directoryContents) size > 0 ifTrue:[
+	    files do:[:aFilenameString |
+		|f|
+
+		f := self construct:aFilenameString.
+		Error handle:[:ex |
+		    f isDirectory ifFalse:[ ex reject ].
+
+		    f recursiveRemoveAll.
+		    f removeDirectory
+		] do:[
+		    f remove
+		].
 
 "/                f isDirectory ifTrue:[
 "/                    f recursiveRemoveWithoutOSCommand
 "/                ] ifFalse:[
 "/                    f remove
 "/                ].
-            ].
-        ]
+	    ].
+	]
     ].
 
     "
@@ -3343,9 +3346,9 @@
      This one walks down the directory hierarchy, not using any OS
      command to do the remove."
 
-    self 
-        recursiveRemoveAll;
-        remove.
+    self
+	recursiveRemoveAll;
+	remove.
 
     "
      'foo' asFilename makeDirectory.
@@ -3371,18 +3374,18 @@
 
     osName := self osNameForFile.
     (ok := OperatingSystem removeFile:osName) ifFalse:[
-        linkInfo := self linkInfo.
-        linkInfo isNil ifTrue:[
-            "file does not exist - no error"
-            ^ self.
-        ] ifFalse:[linkInfo isDirectory ifTrue:[
-            ok := OperatingSystem removeDirectory:osName
-        ]].
-        ok ifFalse:[
-            self exists ifTrue:[
-                self removeError:self
-            ]
-        ]
+	linkInfo := self linkInfo.
+	linkInfo isNil ifTrue:[
+	    "file does not exist - no error"
+	    ^ self.
+	] ifFalse:[linkInfo isDirectory ifTrue:[
+	    ok := OperatingSystem removeDirectory:osName
+	]].
+	ok ifFalse:[
+	    self exists ifTrue:[
+		self removeError:self
+	    ]
+	]
     ].
 
     "
@@ -3394,7 +3397,7 @@
      'foo' asFilename makeDirectory.
      'foo/bar' asFilename writeStream close.
      'foo' asFilename remove.   'expect an exception'
-     'foo' asFilename recursiveRemove.   
+     'foo' asFilename recursiveRemove.
     "
 
     "Modified: / 20-11-1997 / 17:40:22 / stefan"
@@ -3411,25 +3414,25 @@
 
     ok := OperatingSystem removeDirectory:(self osNameForFile).
     ok ifFalse:[
-        self exists ifFalse:[ ^ self].
-        self removeError:self
+	self exists ifFalse:[ ^ self].
+	self removeError:self
     ].
 
     "
      (FileStream newFileNamed:'foo') close.
-     'foo' asFilename removeDirectory   
+     'foo' asFilename removeDirectory
     "
 
     "
      'foo' asFilename writeStream close.
-     'foo' asFilename removeDirectory   
+     'foo' asFilename removeDirectory
     "
 
     "
      'foo' asFilename makeDirectory.
      'foo/bar' asFilename writeStream close.
      ('foo' asFilename remove) ifFalse:[
-        Transcript showCR:'could not remove foo'
+	Transcript showCR:'could not remove foo'
      ]
     "
 
@@ -3444,19 +3447,19 @@
      Use #recursiveRemove in order to (recursively) remove non empty directories."
 
     (OperatingSystem removeFile:self osNameForFile) ifFalse:[
-        self exists ifTrue:[
-            self removeError:self
-        ].
+	self exists ifTrue:[
+	    self removeError:self
+	].
     ].
 
     "
      (FileStream newFileNamed:'foo') close.
-     'foo' asFilename removeFile   
+     'foo' asFilename removeFile
     "
 
     "
      'foo' asFilename makeDirectory.
-     'foo' asFilename removeFile   
+     'foo' asFilename removeFile
     "
 !
 
@@ -3468,18 +3471,18 @@
     |errno newName|
 
     newName := newNameArg asFilename.
-    (OperatingSystem 
-        renameFile:(self osNameForFile) 
-        to:(newName osNameForFile)
+    (OperatingSystem
+	renameFile:(self osNameForFile)
+	to:(newName osNameForFile)
     ) ifFalse:[
-        errno := OperatingSystem lastErrorNumber.
-
-        self exists ifFalse:[
-            ^ self fileNotFoundError:self
-        ].
-        (OperatingSystem errorHolderForNumber:errno) 
-            parameter:newName;
-            reportError.
+	errno := OperatingSystem lastErrorNumber.
+
+	self exists ifFalse:[
+	    ^ self fileNotFoundError:self
+	].
+	(OperatingSystem errorHolderForNumber:errno)
+	    parameter:newName;
+	    reportError.
     ].
 
     "
@@ -3504,34 +3507,34 @@
 
     inStream := self readStream.
     newName exists ifTrue:[
-        accessRights := newName accessRights.
+	accessRights := newName accessRights.
     ] ifFalse:[
-        accessRights := self accessRights.
+	accessRights := self accessRights.
     ].
 
     [
-        "let the temp filename start with a ~ to make it invisible"    
-        tempStream := FileStream newTemporaryIn:newName directory osNameForFile nameTemplate:'~%1_%2'.
-        [
-            "would be nice to keep the access rights of the original file"    
-            tempStream fileName accessRights:accessRights.
-        ] on:OperatingSystem accessDeniedErrorSignal do:[:ex|
-            "ignore the error - may occure when copying to a network drive"
-        ].            
-
-        inStream binary; buffered:false.
-        tempStream binary; buffered:false.
-        [
-            inStream copyToEndInto:tempStream.
-        ] ifCurtailed:[
-            tempStream close.
-            tempStream fileName remove.
-            tempStream := nil.
-        ].
-        tempStream syncData.
+	"let the temp filename start with a ~ to make it invisible"
+	tempStream := FileStream newTemporaryIn:newName directory osNameForFile nameTemplate:'~%1_%2'.
+	[
+	    "would be nice to keep the access rights of the original file"
+	    tempStream fileName accessRights:accessRights.
+	] on:OperatingSystem accessDeniedErrorSignal do:[:ex|
+	    "ignore the error - may occure when copying to a network drive"
+	].
+
+	inStream binary; buffered:false.
+	tempStream binary; buffered:false.
+	[
+	    inStream copyToEndInto:tempStream.
+	] ifCurtailed:[
+	    tempStream close.
+	    tempStream fileName remove.
+	    tempStream := nil.
+	].
+	tempStream syncData.
     ] ensure:[
-        inStream close.
-        tempStream notNil ifTrue:[tempStream close].
+	inStream close.
+	tempStream notNil ifTrue:[tempStream close].
     ].
     tempStream fileName renameTo:newName.
 
@@ -3551,7 +3554,7 @@
      (raises an exception, if not)"
 
     (OperatingSystem truncateFile:self osNameForFile to:newSize) ifFalse:[
-        ^ self reportError:'unsupported operation' with:self
+	^ self reportError:'unsupported operation' with:self
     ]
 
     "
@@ -3579,7 +3582,7 @@
     ^ i accessTime
 
     "
-     Filename currentDirectory accessTime 
+     Filename currentDirectory accessTime
     "
 
     "Created: / 9.7.1996 / 10:19:15 / cg"
@@ -3598,7 +3601,7 @@
     ^ i creationTime
 
     "
-     Filename currentDirectory creationTime 
+     Filename currentDirectory creationTime
     "
 
     "Created: / 9.7.1996 / 10:18:59 / cg"
@@ -3608,7 +3611,7 @@
 
 dates
     "return the file's modification and access times as an object (currently a dictionary)
-     that responds to the at: message with arguments 
+     that responds to the at: message with arguments
      #modified, #accessed or #statusChanged."
 
     |info dates osName|
@@ -3616,12 +3619,12 @@
     osName := self osNameForAccess.
     info := OperatingSystem infoOf:osName.
     info isNil ifTrue:[
-        "maybe this is a symbolic link with a broken link target.
-         Answer the dates of the link itself"
-        info := OperatingSystem linkInfoOf:osName.
-        info isNil ifTrue:[
-            ^ nil
-        ]
+	"maybe this is a symbolic link with a broken link target.
+	 Answer the dates of the link itself"
+	info := OperatingSystem linkInfoOf:osName.
+	info isNil ifTrue:[
+	    ^ nil
+	]
     ].
     dates := IdentityDictionary new.
     dates at:#created put:(info creationTime).
@@ -3631,7 +3634,7 @@
     ^ dates
 
     "
-     Filename currentDirectory dates  
+     Filename currentDirectory dates
      '../regression' asFilename dates
     "
 
@@ -3653,44 +3656,44 @@
     "this returns a string describing the type of contents of
      the file. This is done using the unix 'file' command,
      (which usually is configurable by /etc/magic).
-     On non-unix systems, this may simply return 'file', 
+     On non-unix systems, this may simply return 'file',
      not knowning about the contents.
      Warning:
-         Since the returned string differs among systems (and language settings),
-         it is only useful for user-information; 
-         NOT as a tag to be used by a program."
+	 Since the returned string differs among systems (and language settings),
+	 it is only useful for user-information;
+	 NOT as a tag to be used by a program."
 
     |suffix baseNm info mime|
 
     "/ since we cannot depend on a 'file' command being available,
-    "/ do the most obvious ones here. 
+    "/ do the most obvious ones here.
     "/ (also useful since the 'file' command takes some time, and the code
     "/  below is faster for common things like directories)
 
     info := self linkInfo.
     info isNil ifTrue:[
-        ^ 'removed'         "/ could happen, when coming from a snapshot image
+	^ 'removed'         "/ could happen, when coming from a snapshot image
     ].
 
     info isSymbolicLink ifTrue:[
-        ^ 'symbolic link to ' , info path
+	^ 'symbolic link to ' , info path
     ].
     info isDirectory ifTrue:[
-        self isReadable ifFalse:[^ 'directory, unreadable'].
-        self isExecutable ifFalse:[^ 'directory, locked'].
-        ^ 'directory'
+	self isReadable ifFalse:[^ 'directory, unreadable'].
+	self isExecutable ifFalse:[^ 'directory, locked'].
+	^ 'directory'
     ].
     info isCharacterSpecial ifTrue:[
-        ^ 'character device special file'
+	^ 'character device special file'
     ].
     info isBlockSpecial ifTrue:[
-        ^ 'block device special file'
+	^ 'block device special file'
     ].
     info isSocket ifTrue:[
-        ^ 'socket'
+	^ 'socket'
     ].
     info isFifo ifTrue:[
-        ^ 'fifo'
+	^ 'fifo'
     ].
 
     self isReadable ifFalse:[^ 'unreadable'].
@@ -3701,22 +3704,22 @@
 
     mime := self mimeTypeOfContents.
     mime notNil ifTrue:[
-        "/ kludge to avoid making libview a prereq. of libbasic
-        (Smalltalk at:#MIMETypes) notNil ifTrue:[
-            info := (Smalltalk at:#MIMETypes) fileInfoForMimeType:mime.
-            info notNil ifTrue:[^ info].
-        ].
+	"/ kludge to avoid making libview a prereq. of libbasic
+	(Smalltalk at:#MIMETypes) notNil ifTrue:[
+	    info := (Smalltalk at:#MIMETypes) fileInfoForMimeType:mime.
+	    info notNil ifTrue:[^ info].
+	].
     ].
     ^ 'file'
 
     "
-     'Makefile' asFilename fileType 
-     '.' asFilename fileType     
-     '/dev/null' asFilename fileType 
-     '/usr/tmp' asFilename fileType 
-     '/tmp/.X11-unix/X0' asFilename fileType 
-     'smalltalk.rc' asFilename fileType    
-     'bitmaps/SBrowser.xbm' asFilename fileType    
+     'Makefile' asFilename fileType
+     '.' asFilename fileType
+     '/dev/null' asFilename fileType
+     '/usr/tmp' asFilename fileType
+     '/tmp/.X11-unix/X0' asFilename fileType
+     'smalltalk.rc' asFilename fileType
+     'bitmaps/SBrowser.xbm' asFilename fileType
     "
 
     "Modified: / 21.7.1998 / 11:25:56 / cg"
@@ -3728,7 +3731,7 @@
     ^ OperatingSystem idOf:(self osNameForAccess)
 
     "
-     Filename currentDirectory id 
+     Filename currentDirectory id
     "
 
     "Modified: 9.7.1996 / 10:19:27 / cg"
@@ -3740,30 +3743,30 @@
      the info (for which corresponding access methods are understood by
      the returned object) is:
 
-         type  - a symbol giving the files fileType
-         mode  - numeric access mode 
-         uid   - owners user id
-         gid   - owners group id
-         size  - files size
-         id    - files number (i.e. inode number)
-         accessed      - last access time (as osTime-stamp)
-         modified      - last modification time (as osTime-stamp)
-         statusChangeTime - last staus change (as osTime-stamp)
+	 type  - a symbol giving the files fileType
+	 mode  - numeric access mode
+	 uid   - owners user id
+	 gid   - owners group id
+	 size  - files size
+	 id    - files number (i.e. inode number)
+	 accessed      - last access time (as osTime-stamp)
+	 modified      - last modification time (as osTime-stamp)
+	 statusChangeTime - last staus change (as osTime-stamp)
 
      Some of the fields may be returned as nil on systems which do not provide
      all of the information.
      The minimum returned info (i.e. on all OS's) will consist of at least:
-        modified
-        size
-        type
+	modified
+	size
+	type
 
      Dont expect things like uid/gid/mode to be non-nil; write your application
      to either handle nil values,
      or (better) use one of isXXXX query methods. (Be prepared for DOS ...)
      (i.e. instead of:
-        someFilename type == #directory
+	someFilename type == #directory
       use
-        someFilename isDirectory
+	someFilename isDirectory
     "
 
     ^ OperatingSystem infoOf:(self osNameForAccess)
@@ -3791,26 +3794,26 @@
     "return the file's info. If it is a symbolic link return the info of the link itself
      instead of the link's target.
      The information is the same as returned by #info, except that if the
-     receiver represents a symbolic link, the links information 
-     is returned 
-     (while in this case, #info returns the info of the target file, 
+     receiver represents a symbolic link, the links information
+     is returned
+     (while in this case, #info returns the info of the target file,
       which is accessed via the symbolic link).
 
      In addition to the normal entries, Unix returns an additional entry:
-         path -> the target files pathname
+	 path -> the target files pathname
 
      See the comment in #info for more details."
 
     ^ OperatingSystem linkInfoOf:(self osNameForAccess)
 
     "
-     Filename currentDirectory linkInfo 
-     '/dev/null' asFilename linkInfo    
-     'Make.proto' asFilename linkInfo   
-     'Make.proto' asFilename linkInfo path  
-     'source/Point.st' asFilename linkInfo 
-     '../../libbasic/Point.st' asFilename linkInfo 
-     '/usr/tmp' asFilename linkInfo 
+     Filename currentDirectory linkInfo
+     '/dev/null' asFilename linkInfo
+     'Make.proto' asFilename linkInfo
+     'Make.proto' asFilename linkInfo path
+     'source/Point.st' asFilename linkInfo
+     '../../libbasic/Point.st' asFilename linkInfo
+     '/usr/tmp' asFilename linkInfo
     "
 
     "Modified: 1.11.1996 / 20:49:09 / cg"
@@ -3839,7 +3842,7 @@
     ^ OperatingSystem typeOf:(self osNameForAccess)
 
     "
-     Filename currentDirectory type 
+     Filename currentDirectory type
     "
 
     "Modified: 9.7.1996 / 10:19:27 / cg"
@@ -3870,7 +3873,7 @@
 
 / subname
     "Same as construct: Taking the receiver as a directory name, construct a new
-     filename for an entry within this directory 
+     filename for an entry within this directory
      (i.e. for a file or a subdirectory in that directory).
      The argument may not specify an absolute path name.
      Please do not use this to create filenames with suffixes,
@@ -3881,9 +3884,9 @@
     ^ self construct:subname
 
     "
-     '/tmp' asFilename / 'foo'    
-     '/' asFilename / 'foo' / 'bar' / 'baz'        
-     '/foo/bar' asFilename / ('baz' asFilename) 
+     '/tmp' asFilename / 'foo'
+     '/' asFilename / 'foo' / 'bar' / 'baz'
+     '/foo/bar' asFilename / ('baz' asFilename)
 
      Bad example; works on UNIX, but may not on others:
        'foo/bar.baz' / '.suff'
@@ -3892,7 +3895,7 @@
 
 construct:subname
     "taking the receiver as a directory name, construct a new
-     filename for an entry within this directory 
+     filename for an entry within this directory
      (i.e. for a file or a subdirectory in that directory).
      The argument may not specify an absolute path name.
      Please do not use this to create filenames with suffixes,
@@ -3905,11 +3908,11 @@
     ^ self species named:constructedName.
 
     "
-     '/tmp' asFilename construct:'foo'    
-     '/' asFilename construct:'foo'         
+     '/tmp' asFilename construct:'foo'
+     '/' asFilename construct:'foo'
      '/usr/tmp' asFilename construct:'foo'
-     '/foo/bar' asFilename construct:'baz' 
-     '/foo/bar' asFilename construct:'baz' asFilename 
+     '/foo/bar' asFilename construct:'baz'
+     '/foo/bar' asFilename construct:'baz' asFilename
 
      Bad example; works on UNIX, but may not on others:
        'foo/bar.baz' asFilename construct:'.suff'
@@ -3921,7 +3924,7 @@
 constructDirectory:subname
     "same as #construct: on most systems.
      (may allow different/relaxed name syntax of the argument on some systems)"
-     
+
     ^ self species named:(self constructDirectoryString:subname)
 !
 
@@ -3934,10 +3937,10 @@
 
 constructString:subName
     "taking the receiver as a directory name, construct a new
-     filename-string for an entry within this directory 
+     filename-string for an entry within this directory
      (i.e. for a file or a subdirectory in that directory).
      The argument may not specify an absolute path name.
-     The code below works for UNIX & MSDOS; 
+     The code below works for UNIX & MSDOS;
      other filename classes (i.e. VMS) may want to redefine this method."
 
     |sepString sub|
@@ -3945,19 +3948,19 @@
     sub := subName asString.
     sepString := self species separatorString.
     nameString size == 0 ifTrue:[
-        ^ sub
+	^ sub
     ].
     (nameString endsWith:sepString) ifTrue:[
-        ^ nameString , sub
+	^ nameString , sub
     ].
     ^ nameString , sepString , sub
 
     "
-     '/tmp' asFilename constructString:'foo'   
-     '/' asFilename constructString:'foo'         
+     '/tmp' asFilename constructString:'foo'
+     '/' asFilename constructString:'foo'
      '/usr/tmp' asFilename constructString:'foo'
-     '/foo/bar' asFilename constructString:'baz' 
-     '' asFilename constructString:'baz' 
+     '/foo/bar' asFilename constructString:'baz'
+     '' asFilename constructString:'baz'
     "
 
     "Modified: / 7.9.1995 / 10:15:22 / claus"
@@ -3977,8 +3980,8 @@
     ^ (self construct:fileName)
 
     "
-     '/tmp' asFilename filenameFor:'foo'    
-     '/tmp' asFilename filenameFor:'/foo'    
+     '/tmp' asFilename filenameFor:'foo'
+     '/tmp' asFilename filenameFor:'/foo'
     "
 
     "Created: 18.9.1997 / 14:34:14 / stefan"
@@ -3986,7 +3989,7 @@
 
 secureConstruct:subname
     "taking the receiver as a directory name, construct a new
-     filename for an entry within this directory 
+     filename for an entry within this directory
      (i.e. for a file or a subdirectory in that directory).
      The argument may not specify an absolute path name.
      Please do not use this to create filenames with suffixes,
@@ -3999,14 +4002,14 @@
     ^ self species named:(self secureConstructString:subname)
 
     "
-     '/tmp' asFilename secureConstruct:'foo'    
-     '/tmp' asFilename secureConstruct:'../foo'    
-     '/tmp' asFilename secureConstruct:'/./foo'    
-     '/tmp' asFilename secureConstruct:'foo/../bar'    
-     '/' asFilename secureConstruct:'foo'         
+     '/tmp' asFilename secureConstruct:'foo'
+     '/tmp' asFilename secureConstruct:'../foo'
+     '/tmp' asFilename secureConstruct:'/./foo'
+     '/tmp' asFilename secureConstruct:'foo/../bar'
+     '/' asFilename secureConstruct:'foo'
      '/usr/tmp' asFilename secureConstruct:'foo'
-     '/foo/bar' asFilename secureConstruct:'baz' 
-     '/foo/bar' asFilename secureConstruct:'baz' asFilename 
+     '/foo/bar' asFilename secureConstruct:'baz'
+     '/foo/bar' asFilename secureConstruct:'baz' asFilename
 
      Bad example; works on UNIX, but may not on others:
        'foo/bar.baz' secureConstruct:'.suff'
@@ -4017,13 +4020,13 @@
 
 secureConstructString:subName
     "taking the receiver as a directory name, construct a new
-     filename-string for an entry within this directory 
+     filename-string for an entry within this directory
      (i.e. for a file or a subdirectory in that directory).
-    
+
      This method differs from #constructString, by not permitting subName
      to navigate above (via ..) the current filename.
 
-     The code below works for UNIX & MSDOS; 
+     The code below works for UNIX & MSDOS;
      other filename classes (i.e. VMS) may want to redefine this method."
 
     |sepString sub normalizedPath pathStream|
@@ -4034,38 +4037,38 @@
     sub := sub asCollectionOfSubstringsSeparatedByAll:sepString.
     normalizedPath := OrderedCollection new:sub size.
     sub do:[:eachPathComponent|
-        eachPathComponent = '..' ifTrue:[
-            normalizedPath isEmpty ifTrue:[
-                self error:'secureConstruct: - trying to escape from: ', nameString.
-            ].
-            normalizedPath removeLast.
-        ] ifFalse:[(eachPathComponent notEmpty and:[eachPathComponent ~= '.']) ifTrue:[
-            normalizedPath add:eachPathComponent.
-        ]]
+	eachPathComponent = '..' ifTrue:[
+	    normalizedPath isEmpty ifTrue:[
+		self error:'secureConstruct: - trying to escape from: ', nameString.
+	    ].
+	    normalizedPath removeLast.
+	] ifFalse:[(eachPathComponent notEmpty and:[eachPathComponent ~= '.']) ifTrue:[
+	    normalizedPath add:eachPathComponent.
+	]]
     ].
     pathStream := CharacterWriteStream with:nameString.
     (nameString notEmpty and:[(nameString endsWith:sepString) not]) ifTrue:[
-        pathStream nextPutAll:sepString.
+	pathStream nextPutAll:sepString.
     ].
     normalizedPath do:[:eachPathComponent|
-        pathStream nextPutAll:eachPathComponent.
+	pathStream nextPutAll:eachPathComponent.
     ] separatedBy:[
-        pathStream nextPutAll:sepString.
+	pathStream nextPutAll:sepString.
     ].
-        
+
     ^ pathStream contents.
 
     "
-     '/tmp' asFilename secureConstructString:'fooÅ '   
-     '/tmp' asFilename secureConstructString:'../foo'   
-     '/tmp' asFilename secureConstructString:'foo/../bla'   
-     '/tmp' asFilename secureConstructString:'foo/./bla'   
-     '/tmp' asFilename secureConstructString:'/bla/foo/../../foo'   
-     '/' asFilename secureConstructString:'foo'         
+     '/tmp' asFilename secureConstructString:'fooÅ '
+     '/tmp' asFilename secureConstructString:'../foo'
+     '/tmp' asFilename secureConstructString:'foo/../bla'
+     '/tmp' asFilename secureConstructString:'foo/./bla'
+     '/tmp' asFilename secureConstructString:'/bla/foo/../../foo'
+     '/' asFilename secureConstructString:'foo'
      '/usr/tmp' asFilename secureConstructString:'foo'
-     '/foo/bar' asFilename secureConstructString:'baz' 
-     '' asFilename secureConstructString:'baz' 
-     '' asFilename secureConstructString:'/baz' 
+     '/foo/bar' asFilename secureConstructString:'baz'
+     '' asFilename secureConstructString:'baz'
+     '' asFilename secureConstructString:'/baz'
     "
 ! !
 
@@ -4084,10 +4087,10 @@
     ^ (nameString , aString asString)
 
     "
-     'Makefile' asFilename , '.bak'        
-     ('Makefile' asFilename , '.bak') asFilename  
-     'Makefile' asFilename withSuffix:'bak' 
-     'Makefile' asFilename construct:'.bak'     
+     'Makefile' asFilename , '.bak'
+     ('Makefile' asFilename , '.bak') asFilename
+     'Makefile' asFilename withSuffix:'bak'
+     'Makefile' asFilename construct:'.bak'
     "
 
     "Modified: / 07-09-1997 / 23:45:36 / cg"
@@ -4098,18 +4101,18 @@
     "normalize a filename by removing all empty path components or dots,
      and by resolving parent directory '..' references.
 
-     The code below works for UNIX & MSDOS; 
+     The code below works for UNIX & MSDOS;
      other filename classes (i.e. VMS) may want to redefine this method."
 
     nameString := self species canonicalize:nameString.
 
     "
-        '/tmp/bla' asFilename canonicalize.    
-        '/tmp/bla/../fasel' asFilename canonicalize.
-        '/tmp/bla/.././/fasel' asFilename canonicalize.
-        '..' asFilename canonicalize.
-        'bla/../fasel' asFilename canonicalize.
-        '//bla/../fasel' asFilename canonicalize.
+	'/tmp/bla' asFilename canonicalize.
+	'/tmp/bla/../fasel' asFilename canonicalize.
+	'/tmp/bla/.././/fasel' asFilename canonicalize.
+	'..' asFilename canonicalize.
+	'bla/../fasel' asFilename canonicalize.
+	'//bla/../fasel' asFilename canonicalize.
     "
 ! !
 
@@ -4120,12 +4123,12 @@
      On non-windows systems, an error is raised"
 
     OperatingSystem isMSWINDOWSlike ifFalse:[
-        self warn:'sorry - this operation is only available under windows'.
+	self warn:'sorry - this operation is only available under windows'.
     ].
 
     OperatingSystem
-        openApplicationForDocument:self pathName 
-        operation:#explore.
+	openApplicationForDocument:self pathName
+	operation:#explore.
 
     "Created: / 21-07-2012 / 12:28:18 / cg"
 !
@@ -4135,10 +4138,10 @@
      On non-osx systems, an error is raised"
 
     OperatingSystem isOSXlike ifFalse:[
-        self warn:'sorry - this operation is only available under osx'.
+	self warn:'sorry - this operation is only available under osx'.
     ].
 
-    OperatingSystem executeCommand:'open "',self pathName,'"' 
+    OperatingSystem executeCommand:'open "',self pathName,'"'
 !
 
 openTerminal
@@ -4148,29 +4151,29 @@
      on unix, an xterm is opened."
 
     OperatingSystem isOSXlike ifTrue:[
-        "/ I dont know yet how to tell the terminal to
-        "/ go to a particular directory.
-        "/ therefore, use the built in terminal
-        VT100TerminalView openShellIn:self pathName.
-        ^ self.
+	"/ I dont know yet how to tell the terminal to
+	"/ go to a particular directory.
+	"/ therefore, use the built in terminal
+	VT100TerminalView openShellIn:self pathName.
+	^ self.
     ].
 
     [
-        |cmd|
-
-        OperatingSystem isOSXlike ifTrue:[
-            cmd := '/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal ' 
-        ] ifFalse:[
-            OperatingSystem isMSWINDOWSlike ifTrue:[
-                cmd := 'c:\windows\System32\cmd.exe'        
-            ] ifFalse:[
-                "/ VT100TerminalView openShellIn:self pathName
-                cmd := 'xterm' 
-            ]
-        ].
-        OperatingSystem 
-            executeCommand:cmd
-            inDirectory:self pathName. 
+	|cmd|
+
+	OperatingSystem isOSXlike ifTrue:[
+	    cmd := '/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal '
+	] ifFalse:[
+	    OperatingSystem isMSWINDOWSlike ifTrue:[
+		cmd := 'c:\windows\System32\cmd.exe'
+	    ] ifFalse:[
+		"/ VT100TerminalView openShellIn:self pathName
+		cmd := 'xterm'
+	    ]
+	].
+	OperatingSystem
+	    executeCommand:cmd
+	    inDirectory:self pathName.
     ] fork
 ! !
 
@@ -4202,7 +4205,7 @@
 getName
     "get the raw filename"
 
-    ^ nameString 
+    ^ nameString
 !
 
 setName:aString
@@ -4221,9 +4224,9 @@
     ^ OperatingSystem isValidPath:(self osNameForAccess)
 
     "
-     '/foo/bar' asFilename exists 
-     '/tmp' asFilename exists  
-     'Makefile' asFilename exists   
+     '/foo/bar' asFilename exists
+     '/tmp' asFilename exists
+     'Makefile' asFilename exists
     "
 !
 
@@ -4231,10 +4234,10 @@
     "VW compatibility"
 
     ^ (self filesMatching:aPattern)
-            collect:[:eachName | self construct:eachName].
-
-    "
-     '/etc' asFilename filenamesMatching:'a*;c*' 
+	    collect:[:eachName | self construct:eachName].
+
+    "
+     '/etc' asFilename filenamesMatching:'a*;c*'
     "
 
     "Created: / 15.4.1997 / 15:40:02 / cg"
@@ -4252,12 +4255,12 @@
     matchers := aPattern asCollectionOfSubstringsSeparatedBy:$;.
     caseSensitive := self species isCaseSensitive.
     ^ self directoryContents
-        select:[:name | 
-                (matchers detect:[:p | p match:name caseSensitive:caseSensitive] ifNone:0) ~~ 0
-               ]
-
-    "
-     '/etc' asFilename filesMatching:'a*;c*' 
+	select:[:name |
+		(matchers detect:[:p | p match:name caseSensitive:caseSensitive] ifNone:0) ~~ 0
+	       ]
+
+    "
+     '/etc' asFilename filesMatching:'a*;c*'
     "
 
     "Created: / 15.4.1997 / 15:40:02 / cg"
@@ -4276,17 +4279,17 @@
     matchers := aPattern asCollectionOfSubstringsSeparatedBy:$;.
     caseSensitive := self species isCaseSensitive.
 
-    ^ self directoryContents 
-        select:[:name | 
-                name ~= '.'
-                and:[name ~= '..'
-                and:[(matchers detect:[:p | p match:name caseSensitive:caseSensitive] ifNone:0) ~~ 0]]
+    ^ self directoryContents
+	select:[:name |
+		name ~= '.'
+		and:[name ~= '..'
+		and:[(matchers detect:[:p | p match:name caseSensitive:caseSensitive] ifNone:0) ~~ 0]]
       ]
 
     "
-     Filename currentDirectory filesMatching:'M*' 
-     '/etc' asFilename filesMatching:'[a-z]*' 
-     '../../libbasic' asFilename filesMatching:'[A-D]*.st'  
+     Filename currentDirectory filesMatching:'M*'
+     '/etc' asFilename filesMatching:'[a-z]*'
+     '../../libbasic' asFilename filesMatching:'[A-D]*.st'
     "
 
     "Created: / 15.4.1997 / 12:52:10 / cg"
@@ -4305,10 +4308,10 @@
     ^ OperatingSystem isExecutable:(self osNameForAccess)
 
     "
-     '/foo/bar' asFilename isExecutable 
-     '/tmp' asFilename isExecutable   
-     'Makefile' asFilename isExecutable   
-     '/bin/ls' asFilename isExecutable   
+     '/foo/bar' asFilename isExecutable
+     '/tmp' asFilename isExecutable
+     'Makefile' asFilename isExecutable
+     '/bin/ls' asFilename isExecutable
     "
 !
 
@@ -4323,10 +4326,10 @@
       and:[(OperatingSystem isDirectory:osName) not]
 
     "
-     '/tmp' asFilename isExecutable         
-     '/bin/ls' asFilename isExecutable       
-     '/tmp' asFilename isExecutableProgram   
-     '/bin/ls' asFilename isExecutableProgram    
+     '/tmp' asFilename isExecutable
+     '/bin/ls' asFilename isExecutable
+     '/tmp' asFilename isExecutableProgram
+     '/bin/ls' asFilename isExecutableProgram
     "
 !
 
@@ -4342,14 +4345,14 @@
 
 isMountPoint:aPathName
     "return true, if I represent a mount-point.
-     Warning: 
-        the receiver must be an absolute pathname, 
-        because a realPath is not used/generated for the query (to avoid automounting).
-        Aka: do not ask: '../../' asFilename isMountPoint;
+     Warning:
+	the receiver must be an absolute pathname,
+	because a realPath is not used/generated for the query (to avoid automounting).
+	Aka: do not ask: '../../' asFilename isMountPoint;
     "
 
     self isAbsolute ifFalse:[
-        self error:'this query must be done on an absolute pathname'.
+	self error:'this query must be done on an absolute pathname'.
     ].
     ^ OperatingSystem isMountPoint:(self name)
 !
@@ -4360,9 +4363,9 @@
     ^ OperatingSystem isReadable:(self osNameForFile)
 
     "
-     '/foo/bar' asFilename isReadable   
-     '/tmp' asFilename isReadable      
-     'Makefile' asFilename isReadable   
+     '/foo/bar' asFilename isReadable
+     '/tmp' asFilename isReadable
+     'Makefile' asFilename isReadable
     "
 !
 
@@ -4370,17 +4373,17 @@
     "return true, if such a file exists and is a shared library."
 
     ObjectFileLoader isNil ifTrue:[
-        "we cannot handle shared libraries, so there are no shared libraries"
-        ^ false.
+	"we cannot handle shared libraries, so there are no shared libraries"
+	^ false.
     ].
-    ^ (ObjectFileLoader validBinaryExtensions includes:self suffix) 
-        and:[self isRegularFile].
-
-    "
-     'libstx_libbasic.so' asFilename isSharedLibrary         
-     'libstx_libbasic.dll' asFilename isSharedLibrary         
-     '/tmp' asFilename isSharedLibrary         
-     '/tmp.dll' asFilename isSharedLibrary         
+    ^ (ObjectFileLoader validBinaryExtensions includes:self suffix)
+	and:[self isRegularFile].
+
+    "
+     'libstx_libbasic.so' asFilename isSharedLibrary
+     'libstx_libbasic.dll' asFilename isSharedLibrary
+     '/tmp' asFilename isSharedLibrary
+     '/tmp.dll' asFilename isSharedLibrary
     "
 !
 
@@ -4390,9 +4393,9 @@
     ^ OperatingSystem isWritable:(self osNameForFile)
 
     "
-     '/foo/bar' asFilename isWritable 
-     '/tmp' asFilename isWritable   
-     'Makefile' asFilename isWritable   
+     '/foo/bar' asFilename isWritable
+     '/tmp' asFilename isWritable
+     'Makefile' asFilename isWritable
     "
 !
 
@@ -4402,30 +4405,30 @@
      with UID mapping and attribute cache enabled, there may be false negatives."
 
     self isDirectory ifFalse:[
-        ^ false.
+	^ false.
     ].
 
     self isWritable ifFalse:[
-        "/ on an NFS mounted filesystem with UID mapping and
-        "/ attribute cache enabled,
-        "/ this query may fail, but creation may work actually. 
-        "/ check again...
-        [
-            |tempFile|
-
-            tempFile := FileStream newTemporaryIn:self.
-            tempFile close.
-            tempFile fileName remove.
-        ] on:OpenError do:[:ex|
-            ^ false.
-        ].
+	"/ on an NFS mounted filesystem with UID mapping and
+	"/ attribute cache enabled,
+	"/ this query may fail, but creation may work actually.
+	"/ check again...
+	[
+	    |tempFile|
+
+	    tempFile := FileStream newTemporaryIn:self.
+	    tempFile close.
+	    tempFile fileName remove.
+	] on:OpenError do:[:ex|
+	    ^ false.
+	].
     ].
     ^ true.
 
     "
-     '/foo/bar' asFilename isWritableDirectory 
-     '/tmp' asFilename isWritableDirectory   
-     '/etc' asFilename isWritableDirectory   
+     '/foo/bar' asFilename isWritableDirectory
+     '/tmp' asFilename isWritableDirectory
+     '/etc' asFilename isWritableDirectory
      'Makefile' asFilename isWritableDirectory
      '/net/exeptn/home2/office' asFilename isWritable
      '/net/exeptn/home2/office' asFilename isWritableDirectory
@@ -4446,28 +4449,28 @@
      per default (from directories etc.)"
 
     self == Filename ifTrue:[
-        ^ ConcreteClass.
+	^ ConcreteClass.
     ] ifFalse:[
-        ^ self class.
+	^ self class.
     ].
 !
 
 withSpecialExpansions
-    "return a new filename, expanding any OS specific macros. 
+    "return a new filename, expanding any OS specific macros.
      Here, a ~/ prefix is expanded to the users home dir (as in bash)"
 
     |newName|
 
     newName := self species nameWithSpecialExpansions:nameString.
     newName = nameString ifTrue:[
-        ^ self.
+	^ self.
     ].
     ^ self species named:newName.
 
     "
-     '~' asFilename withSpecialExpansions       
-     '~/Desktop' asFilename withSpecialExpansions  
-     '~stefan' asFilename withSpecialExpansions     
+     '~' asFilename withSpecialExpansions
+     '~/Desktop' asFilename withSpecialExpansions
+     '~stefan' asFilename withSpecialExpansions
      '~stefan/Desktop' asFilename withSpecialExpansions
     "
 ! !
@@ -4485,21 +4488,21 @@
 
     "/ kludge to avoid making libview a prereq. of libbasic
     (mimeTypes := Smalltalk at:#MIMETypes) notNil ifTrue:[
-        ^ mimeTypes mimeTypeForFilename:(self name)
+	^ mimeTypes mimeTypeForFilename:(self name)
     ].
     ^ nil
 
     "
-     'Makefile' asFilename mimeTypeFromName     
-     '.' asFilename mimeTypeFromName            
-     '/dev/null' asFilename mimeTypeFromName   
-     '/tmp/.X11-unix/X0' asFilename mimeTypeFromName  
-     'smalltalk.rc' asFilename mimeTypeFromName     
-     'bitmaps/SBrowser.xbm' asFilename mimeTypeFromName    
-     '../../rules/stmkmf' asFilename mimeTypeFromName  
-     '/bläh' asFilename mimeTypeFromName               
-     '/x.zip' asFilename mimeTypeFromName               
-     '/x.gz' asFilename mimeTypeFromName               
+     'Makefile' asFilename mimeTypeFromName
+     '.' asFilename mimeTypeFromName
+     '/dev/null' asFilename mimeTypeFromName
+     '/tmp/.X11-unix/X0' asFilename mimeTypeFromName
+     'smalltalk.rc' asFilename mimeTypeFromName
+     'bitmaps/SBrowser.xbm' asFilename mimeTypeFromName
+     '../../rules/stmkmf' asFilename mimeTypeFromName
+     '/bläh' asFilename mimeTypeFromName
+     '/x.zip' asFilename mimeTypeFromName
+     '/x.gz' asFilename mimeTypeFromName
     "
 !
 
@@ -4513,7 +4516,7 @@
 
     type := self type.
     type isNil ifTrue:[ ^ nil ].
-    type == #directory ifTrue:[ ^ nil ].                                                              
+    type == #directory ifTrue:[ ^ nil ].
     type == #characterSpecial ifTrue:[ ^ nil ].
     type == #blockSpecial ifTrue:[ ^ nil ].
     type == #socket ifTrue:[ ^ nil ].
@@ -4526,29 +4529,29 @@
     buffer := String new:2048.
 
     s errorSignal handle:[:ex |
-        size := 0.
+	size := 0.
     ] do:[
-        size := s nextBytes:buffer size into:buffer.
+	size := s nextBytes:buffer size into:buffer.
     ].
     s close.
 
     "/ kludge to avoid making libview a prereq. of libbasic
     (mimeTypes := Smalltalk at:#MIMETypes) notNil ifTrue:[
-        ^ mimeTypes mimeTypeOfData:buffer suffix:self suffix.
+	^ mimeTypes mimeTypeOfData:buffer suffix:self suffix.
     ].
     ^ nil
 
     "
-     'Makefile' asFilename mimeTypeOfContents     
-     '.' asFilename mimeTypeOfContents            
-     '/dev/null' asFilename mimeTypeOfContents  
-     '/tmp/.X11-unix/X0' asFilename mimeTypeOfContents   
-     'smalltalk.rc' asFilename mimeTypeOfContents      
-     'bitmaps/SBrowser.xbm' asFilename mimeTypeOfContents    
-     '../../rules/stmkmf' asFilename mimeTypeOfContents 
-     '/bläh' asFilename mimeTypeOfContents              
+     'Makefile' asFilename mimeTypeOfContents
+     '.' asFilename mimeTypeOfContents
+     '/dev/null' asFilename mimeTypeOfContents
+     '/tmp/.X11-unix/X0' asFilename mimeTypeOfContents
+     'smalltalk.rc' asFilename mimeTypeOfContents
+     'bitmaps/SBrowser.xbm' asFilename mimeTypeOfContents
+     '../../rules/stmkmf' asFilename mimeTypeOfContents
+     '/bläh' asFilename mimeTypeOfContents
      'C:\Dokumente und Einstellungen\cg\Favoriten\languages.lnk' asFilename mimeTypeOfContents
-     'G:\A\A01.TOP' asFilename mimeTypeOfContents       
+     'G:\A\A01.TOP' asFilename mimeTypeOfContents
     "
 
     "Modified: / 06-11-2006 / 11:44:58 / cg"
@@ -4572,29 +4575,29 @@
     sep := self separator.
     len := nameString size.
     ((len == 1) and:[(nameString at:1) == sep]) ifTrue:[
-        ^ nameString
+	^ nameString
     ].
 
     endIdx := len.
     len > 1 ifTrue:[
-        (nameString at:len) == sep ifTrue:[endIdx := endIdx - 1].
+	(nameString at:len) == sep ifTrue:[endIdx := endIdx - 1].
     ].
     index := nameString lastIndexOf:sep startingAt:len-1.
     ^ nameString copyFrom:(index+1) to:endIdx
 
     "
-     '/foo/bar' asFilename baseName  
-     '/foo/bar.cc' asFilename baseName  
-     '.' asFilename baseName          
-     '..' asFilename baseName         
-     '../..' asFilename baseName        
-     '../../libbasic' asFilename baseName        
-     '../../libpr' asFilename baseName        
-     '../../libbasic/Object.st' asFilename baseName        
-     '/' asFilename baseName        
-     '\' asFilename baseName        
-     'c:\' asFilename baseName        
-     '\\idefix' asFilename baseName        
+     '/foo/bar' asFilename baseName
+     '/foo/bar.cc' asFilename baseName
+     '.' asFilename baseName
+     '..' asFilename baseName
+     '../..' asFilename baseName
+     '../../libbasic' asFilename baseName
+     '../../libpr' asFilename baseName
+     '../../libbasic/Object.st' asFilename baseName
+     '/' asFilename baseName
+     '\' asFilename baseName
+     'c:\' asFilename baseName
+     '\\idefix' asFilename baseName
     "
 
     "Modified: / 24.9.1998 / 13:06:23 / cg"
@@ -4610,13 +4613,13 @@
     ^ self species named:(self directoryName)
 
     "
-     '/foo/bar' asFilename directory      
-     '/foo/bar' asFilename directoryName  
-     '/foo/bar' asFilename head  
-
-     '.' asFilename directory        
-     '..' asFilename directory       
-     '../..' asFilename directory     
+     '/foo/bar' asFilename directory
+     '/foo/bar' asFilename directoryName
+     '/foo/bar' asFilename head
+
+     '.' asFilename directory
+     '..' asFilename directory
+     '../..' asFilename directory
     "
 
     "Modified: 29.2.1996 / 20:50:14 / cg"
@@ -4642,10 +4645,10 @@
     sep := self separator.
     sepString := sep asString.
     (nameString = sepString) ifTrue:[
-        "/
-        "/ the trivial '/' case
-        "/
-        ^ sepString
+	"/
+	"/ the trivial '/' case
+	"/
+	^ sepString
     ].
 
     "/
@@ -4653,10 +4656,10 @@
     "/
     p := nameString.
     [p endsWith:sep] whileTrue:[
-        (p = sepString) ifTrue:[
-            ^ sepString
-        ].
-        p := p copyButLast:1
+	(p = sepString) ifTrue:[
+	    ^ sepString
+	].
+	p := p copyButLast:1
     ].
 
     parentDirectoryString := self class parentDirectoryName.
@@ -4664,43 +4667,43 @@
     "/ strip off trailing components
     index := p lastIndexOf:sep startingAt:p size.
     index == 0 ifTrue:[
-        "/ no separator found
-        p = '.' ifTrue:[
-            ^ parentDirectoryString
-        ].
-        p = '..' ifTrue:[
-            ^ parentDirectoryString, sepString, parentDirectoryString
-        ].
-        ^ '.'
+	"/ no separator found
+	p = '.' ifTrue:[
+	    ^ parentDirectoryString
+	].
+	p = '..' ifTrue:[
+	    ^ parentDirectoryString, sepString, parentDirectoryString
+	].
+	^ '.'
     ].
     rest := p copyFrom:(index+1).
     (rest = '.') ifTrue:[
-        ^ p copyTo:index-1.
+	^ p copyTo:index-1.
     ].
     (rest = parentDirectoryString) ifTrue:[
-        ^ (self species named:(p copyTo:(index-1))) directoryName
+	^ (self species named:(p copyTo:(index-1))) directoryName
     ].
     index == 1 ifTrue:[
-        ^ sepString
+	^ sepString
     ].
     ^ p copyTo:(index - 1)
 
     "
-     '/home' asFilename directoryName          
-     '/foo/bar/' asFilename directoryName    
-     '/foo/bar/' asFilename directory      
-
-     '/foo/bar' asFilename directoryName    
-     'bitmaps' asFilename directoryName        
-     'bitmaps' asFilename directoryPathName        
-     '.' asFilename directoryName           
-     '.' asFilename directoryPathName        
-     '..' asFilename directoryName       
-     '..' asFilename directoryPathName       
-     '../..' asFilename directoryName     
-     '../..' asFilename directoryPathName     
-     '/foo/bar/baz/..' asFilename directoryName     
-     '/foo/bar/baz/.' asFilename directoryName     
+     '/home' asFilename directoryName
+     '/foo/bar/' asFilename directoryName
+     '/foo/bar/' asFilename directory
+
+     '/foo/bar' asFilename directoryName
+     'bitmaps' asFilename directoryName
+     'bitmaps' asFilename directoryPathName
+     '.' asFilename directoryName
+     '.' asFilename directoryPathName
+     '..' asFilename directoryName
+     '..' asFilename directoryPathName
+     '../..' asFilename directoryName
+     '../..' asFilename directoryPathName
+     '/foo/bar/baz/..' asFilename directoryName
+     '/foo/bar/baz/.' asFilename directoryName
     "
 
     "Modified: / 7.9.1995 / 10:42:03 / claus"
@@ -4717,18 +4720,18 @@
     ^ (self species named:self pathName) directoryName
 
     "
-     '/foo/bar/' asFilename directoryPathName    
-     '/foo/bar' asFilename directoryPathName    
-
-     '.' asFilename directoryPathName      
-     '.' asFilename directoryName     
-     '.' asFilename directory          
-
-     '..' asFilename directoryPathName       
-     '..' asFilename directoryName       
+     '/foo/bar/' asFilename directoryPathName
+     '/foo/bar' asFilename directoryPathName
+
+     '.' asFilename directoryPathName
+     '.' asFilename directoryName
+     '.' asFilename directory
+
+     '..' asFilename directoryPathName
+     '..' asFilename directoryName
      '..' asFilename directory
 
-     '../..' asFilename directoryPathName     
+     '../..' asFilename directoryPathName
     "
 
     "Modified: 7.9.1995 / 10:42:13 / claus"
@@ -4754,12 +4757,12 @@
 
     ^ self filenameCompletionIn:nil
 
-    " 
-     'mak' asFilename filenameCompletion  
-     'Make' asFilename filenameCompletion  
-     'Makef' asFilename filenameCompletion;yourself  
-     '/u' asFilename filenameCompletion             
-     '../../libpr' asFilename inspect filenameCompletion    
+    "
+     'mak' asFilename filenameCompletion
+     'Make' asFilename filenameCompletion
+     'Makef' asFilename filenameCompletion;yourself
+     '/u' asFilename filenameCompletion
+     '../../libpr' asFilename inspect filenameCompletion
     "
 
     "Modified: 3.7.1996 / 10:53:51 / cg"
@@ -4777,7 +4780,7 @@
      containing the fully expanded filename and the receiver's name is changed to it.
      An empty baseName pattern (i.e. giving the name of a directory) will also return an empty matchset."
 
-    |mySpecies dir baseName matching matchLen try allMatching 
+    |mySpecies dir baseName matching matchLen try allMatching
      sepString parentString prefix nMatch nm caseless lcBaseName|
 
     mySpecies := self species.
@@ -4790,127 +4793,127 @@
 
     sepString := mySpecies separatorString.
     (nm endsWith:sepString) ifTrue:[
-        "/ two exceptions here: 
-        "/   if there is only one file in the directory, that one must be it.
-        "/   otherwise, return the longest common prefix of all files.
-        self isDirectory ifTrue:[
-            |first longest|
-
-            first := nil.
-            OpenError catch:[
-                self directoryContentsDo:[:fileName |
-                    ((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
-                        matching add:fileName.    
-                        first isNil ifTrue:[
-                            first := longest := fileName.
-                        ] ifFalse:[
-                            "/ more than one file
-                            longest := longest commonPrefixWith:fileName ignoreCase:caseless.
-                            longest isEmpty ifTrue:[ 
-                                ^ #() 
-                            ].
-                        ]
-                    ]
-                ].
-            ].
-            longest notNil ifTrue:[
-                nameString := (self constructString:longest).
-                 ^ matching
-            ].
-        ].
-        ^ #()
+	"/ two exceptions here:
+	"/   if there is only one file in the directory, that one must be it.
+	"/   otherwise, return the longest common prefix of all files.
+	self isDirectory ifTrue:[
+	    |first longest|
+
+	    first := nil.
+	    OpenError catch:[
+		self directoryContentsDo:[:fileName |
+		    ((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
+			matching add:fileName.
+			first isNil ifTrue:[
+			    first := longest := fileName.
+			] ifFalse:[
+			    "/ more than one file
+			    longest := longest commonPrefixWith:fileName ignoreCase:caseless.
+			    longest isEmpty ifTrue:[
+				^ #()
+			    ].
+			]
+		    ]
+		].
+	    ].
+	    longest notNil ifTrue:[
+		nameString := (self constructString:longest).
+		 ^ matching
+	    ].
+	].
+	^ #()
     ].
 
     parentString := mySpecies parentDirectoryName.
     baseName := self baseName.
     baseName ~= nm ifTrue:[
-        prefix := self directoryName.
+	prefix := self directoryName.
     ].
 
     self isAbsolute ifTrue:[
-        dir := self directory
+	dir := self directory
     ] ifFalse:[
-        aDirectory isNil ifTrue:[
-            dir := self directory
-        ] ifFalse:[
-            dir := (aDirectory asFilename construct:nm) directory
-        ]
+	aDirectory isNil ifTrue:[
+	    dir := self directory
+	] ifFalse:[
+	    dir := (aDirectory asFilename construct:nm) directory
+	]
     ].
 
     caseless ifTrue:[
-        lcBaseName := baseName asLowercase
+	lcBaseName := baseName asLowercase
     ].
 
     dir class errorReporter openErrorSignal handle:[:ex|
-        ^ #().
+	^ #().
     ] do:[
-        dir directoryContents do:[:fileName |
-            ((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
-                ((caseless and:[fileName asLowercase startsWith:lcBaseName])
-                or:[caseless not and:[fileName startsWith:baseName]]) ifTrue:[
-                    matching add:fileName
-                ]
-            ]
-        ].
+	dir directoryContents do:[:fileName |
+	    ((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
+		((caseless and:[fileName asLowercase startsWith:lcBaseName])
+		or:[caseless not and:[fileName startsWith:baseName]]) ifTrue:[
+		    matching add:fileName
+		]
+	    ]
+	].
     ].
 
     (nMatch := matching size) > 1 ifTrue:[
-        "
-         find the longest common prefix
-        "
-        matchLen := baseName size.
-        matchLen > matching first size ifTrue:[
-            try := baseName.
-            allMatching := false
-        ] ifFalse:[
-            try := matching first copyTo:matchLen.
-            allMatching := true.
-        ].
-
-        [allMatching] whileTrue:[
-            matching do:[:aName |
-                ((caseless and:[aName asLowercase startsWith:try asLowercase])
-                or:[caseless not and:[aName startsWith:try]]) ifFalse:[
-                    allMatching := false
-                ]
-            ].
-            allMatching ifTrue:[
-                matchLen <  matching first size ifTrue:[
-                    matchLen := matchLen + 1.
-                    try := matching first copyTo:matchLen.
-                ] ifFalse:[
-                    allMatching := false
-                ]
-            ] ifFalse:[
-                try := matching first copyTo:matchLen - 1.
-            ]
-        ].
-        "
-         and set my name to the last full match
-        "
-        nameString := nm := try
+	"
+	 find the longest common prefix
+	"
+	matchLen := baseName size.
+	matchLen > matching first size ifTrue:[
+	    try := baseName.
+	    allMatching := false
+	] ifFalse:[
+	    try := matching first copyTo:matchLen.
+	    allMatching := true.
+	].
+
+	[allMatching] whileTrue:[
+	    matching do:[:aName |
+		((caseless and:[aName asLowercase startsWith:try asLowercase])
+		or:[caseless not and:[aName startsWith:try]]) ifFalse:[
+		    allMatching := false
+		]
+	    ].
+	    allMatching ifTrue:[
+		matchLen <  matching first size ifTrue:[
+		    matchLen := matchLen + 1.
+		    try := matching first copyTo:matchLen.
+		] ifFalse:[
+		    allMatching := false
+		]
+	    ] ifFalse:[
+		try := matching first copyTo:matchLen - 1.
+	    ]
+	].
+	"
+	 and set my name to the last full match
+	"
+	nameString := nm := try
     ].
 
     "
      if I had a directory-prefix, change names in collection ...
     "
     prefix notNil ifTrue:[
-        (prefix endsWith:sepString) ifTrue:[
-            "/ avoid introducing double slashes
-            prefix := prefix copyButLast:(sepString size).
-        ].
-        matching := matching collect:[:n | prefix , sepString , n].
-        nMatch == 1 ifTrue:[
-            nameString := nm := matching first
-        ] ifFalse:[
-            nMatch > 1 ifTrue:[
-                nameString := nm := prefix , sepString , nm
-            ]
-        ]
+	(prefix endsWith:sepString) ifTrue:[
+	    "/ avoid introducing double slashes
+	    prefix := prefix copyButLast:(sepString size).
+	].
+	matching := matching collect:[:n | prefix , sepString , n].
+	nMatch == 1 ifTrue:[
+	    nameString := nm := matching first
+	] ifFalse:[
+	    nMatch > 1 ifTrue:[
+		nameString := nm := prefix , sepString , nm
+	    ]
+	]
     ] ifFalse:[
-        nMatch == 1 ifTrue:[
-            nameString := nm := matching first
-        ]
+	nMatch == 1 ifTrue:[
+	    nameString := nm := matching first
+	]
     ].
 
     "
@@ -4925,16 +4928,16 @@
      '/' asFilename filenameCompletion       -> empty
      '/usr/' asFilename filenameCompletion   -> empty
 
-     'mak' asFilename filenameCompletion   
-     'Make' asFilename filenameCompletion    
+     'mak' asFilename filenameCompletion
+     'Make' asFilename filenameCompletion
      'Makef' asFilename filenameCompletion
-     '/u' asFilename filenameCompletion             
+     '/u' asFilename filenameCompletion
      '../../libpr' asFilename filenameCompletion
      '/etc/mail/auth/xx' asFilename filenameCompletion
 
      'c:\pr' asFilename filenameCompletion             -> matching names
      'c:\pr' asFilename filenameCompletion; yourself   -> side effect: name changed to longest match
-     'c:\p' asFilename filenameCompletion 
+     'c:\p' asFilename filenameCompletion
      'c:\' asFilename filenameCompletion  -> empty
      'c:' asFilename filenameCompletion   -> empty
      '\' asFilename filenameCompletion    -> empty
@@ -4944,8 +4947,8 @@
     "Modified: / 17-11-2007 / 14:31:08 / cg"
 !
 
-head 
-    "return the directory name as a string. 
+head
+    "return the directory name as a string.
      An alias for directoryName, for ST-80 compatiblity.
      (this is almost equivalent to #directory, but returns
       a string instead of a Filename instance)"
@@ -4953,9 +4956,9 @@
     ^ self directoryName
 
     "
-     Filename currentDirectory head  
-     'Makefile' asFilename head    
-     '/foo/bar/baz.st' asFilename head  
+     Filename currentDirectory head
+     'Makefile' asFilename head
+     '/foo/bar/baz.st' asFilename head
     "
 
     "Modified: 29.2.1996 / 20:21:25 / cg"
@@ -4969,13 +4972,13 @@
     ^ self isVolumeAbsolute
 
     "
-     '/foo/bar' asFilename isAbsolute 
+     '/foo/bar' asFilename isAbsolute
      '~/bla' asFilename isAbsolute
-     '..' asFilename isAbsolute         
-     '..' asAbsoluteFilename isAbsolute         
-     'source/SBrowser.st' asFilename isAbsolute  
-     'source/SBrowser.st' asFilename isRelative  
-     'SBrowser.st' asFilename isRelative    
+     '..' asFilename isAbsolute
+     '..' asAbsoluteFilename isAbsolute
+     'source/SBrowser.st' asFilename isAbsolute
+     'source/SBrowser.st' asFilename isRelative
+     'SBrowser.st' asFilename isRelative
     "
 !
 
@@ -4999,8 +5002,8 @@
 isParentDirectoryOf:aFilenameOrString
     "Answer true, if myself is a parent directory of aFilenameOrString.
      Unexpected results may be returned, if one of myself or aFilenameOrString does
-     not exist and relative and absolute path names are mixed 
-     ('/' asFilename isParentDirectoryOf:'../noExistant' -> false) 
+     not exist and relative and absolute path names are mixed
+     ('/' asFilename isParentDirectoryOf:'../noExistant' -> false)
 
      Warning: maybe symbolic links must be resolved which could lead to automounting"
 
@@ -5012,38 +5015,38 @@
     otherNames := self class canonicalizedNameComponents:filenameArg name.
     myNames := self class canonicalizedNameComponents:self name.
     ((otherNames startsWith:myNames) and:[myNames first ~= self class parentDirectoryName]) ifTrue:[
-        ^ otherNames ~= myNames
+	^ otherNames ~= myNames
     ].
 
     "fall back - try it again with ~ substitution and symbolic links resolved"
     otherNames := self class canonicalizedNameComponents:filenameArg pathName.
     myNames := self class canonicalizedNameComponents:self pathName.
     (otherNames startsWith:myNames) ifTrue:[
-        ^ otherNames ~= myNames
+	^ otherNames ~= myNames
     ].
 
     myName := self class nameFromComponents:myNames.
     filenameArg allParentDirectoriesDo:[:parent |
-        parent pathName = myName ifTrue:[^ true].
+	parent pathName = myName ifTrue:[^ true].
     ].
     ^ false.
 
     "
-     '/etc' asFilename isParentDirectoryOf:'/etc/passwd' 
-     'etc' asFilename isParentDirectoryOf:'etc/passwd' 
-     '/etc' asFilename isParentDirectoryOf:'/etc/'   
-     '/etc' asFilename isParentDirectoryOf:'/etc'   
-     '/et' asFilename isParentDirectoryOf:'/etc'   
-     '/home' asFilename isParentDirectoryOf:Filename currentDirectory 
-     '~' asFilename isParentDirectoryOf:Filename currentDirectory 
-     '~' asFilename isParentDirectoryOf:'.' 
-     '~' asFilename isParentDirectoryOf:'..' 
-     '~' asFilename isParentDirectoryOf:'../smalltalk' 
-     '../..' asFilename isParentDirectoryOf:'../nonExistant' 
-     '..' asFilename isParentDirectoryOf:'../../nonExistant' 
-     '/' asFilename isParentDirectoryOf:'../nonExistant' 
-     '/' asFilename isParentDirectoryOf:'/phys/qnx'      
-    "       
+     '/etc' asFilename isParentDirectoryOf:'/etc/passwd'
+     'etc' asFilename isParentDirectoryOf:'etc/passwd'
+     '/etc' asFilename isParentDirectoryOf:'/etc/'
+     '/etc' asFilename isParentDirectoryOf:'/etc'
+     '/et' asFilename isParentDirectoryOf:'/etc'
+     '/home' asFilename isParentDirectoryOf:Filename currentDirectory
+     '~' asFilename isParentDirectoryOf:Filename currentDirectory
+     '~' asFilename isParentDirectoryOf:'.'
+     '~' asFilename isParentDirectoryOf:'..'
+     '~' asFilename isParentDirectoryOf:'../smalltalk'
+     '../..' asFilename isParentDirectoryOf:'../nonExistant'
+     '..' asFilename isParentDirectoryOf:'../../nonExistant'
+     '/' asFilename isParentDirectoryOf:'../nonExistant'
+     '/' asFilename isParentDirectoryOf:'/phys/qnx'
+    "
 !
 
 isRelative
@@ -5055,15 +5058,15 @@
     "
      './foo/bar' asFilename isRelative
      '../../foo/bar' asFilename isRelative
-     '/foo/bar' asFilename isRelative     
-     'bar' asFilename isRelative          
+     '/foo/bar' asFilename isRelative
+     'bar' asFilename isRelative
     "
 
     "Modified: 16.1.1997 / 01:19:14 / cg"
 !
 
 isRootDirectory
-    "return true, if I represent the root directory 
+    "return true, if I represent the root directory
      (i.e. I have no parentDir)"
 
     "/ mhmh - should we use:
@@ -5108,20 +5111,20 @@
     ^ nameString
 
     "
-     '/foo/bar' asFilename name        
-     '/foo/bar' asFilename pathName    
-     '.' asFilename name                
-     '.' asFilename pathName             
-     '../..' asFilename name             
-     '../..' asFilename pathName 
-     'bitmaps' asFilename name                
-     'bitmaps' asFilename pathName             
-     '/tmp/../usr' asFilename name       
-     '/tmp/../usr' asFilename pathName    
-     'source/..' asFilename name    
-     'source/..' asFilename pathName    
-     '/tmp/..' asFilename name    
-     '/tmp/..' asFilename pathName    
+     '/foo/bar' asFilename name
+     '/foo/bar' asFilename pathName
+     '.' asFilename name
+     '.' asFilename pathName
+     '../..' asFilename name
+     '../..' asFilename pathName
+     'bitmaps' asFilename name
+     'bitmaps' asFilename pathName
+     '/tmp/../usr' asFilename name
+     '/tmp/../usr' asFilename pathName
+     'source/..' asFilename name
+     'source/..' asFilename pathName
+     '/tmp/..' asFilename name
+     '/tmp/..' asFilename pathName
     "
 
     "Modified: 18.1.1996 / 21:36:27 / cg"
@@ -5141,7 +5144,7 @@
 
 pathName
     "return the full pathname of the file represented by the receiver,
-     as a string. This will not include ..'s. 
+     as a string. This will not include ..'s.
      If the path represented by the receiver does NOT represent a valid path,
      no compression will be done (for now; this may change).
      See also: name"
@@ -5157,13 +5160,13 @@
     ^ OperatingSystem pathNameOf:(self species nameWithSpecialExpansions:nameString).
 
     "
-     '/foo/bar' asFilename pathName  
-     '.' asFilename pathName         
-     '../..' asFilename pathName     
-     '../..' asFilename name           
-     '/tmp/../usr' asFilename pathName   
-     '/././usr' asFilename pathName     
-     '~/..' asFilename pathName     
+     '/foo/bar' asFilename pathName
+     '.' asFilename pathName
+     '../..' asFilename pathName
+     '../..' asFilename name
+     '/tmp/../usr' asFilename pathName
+     '/././usr' asFilename pathName
+     '~/..' asFilename pathName
     "
 
     "Modified: 27.4.1996 / 18:19:52 / cg"
@@ -5180,12 +5183,12 @@
 
     pathOrNil := self physicalPathName.
     pathOrNil isNil ifTrue:[
-        ^ nil
+	^ nil
     ].
     ^ pathOrNil asFilename
 
     "
-     '/foo/bar' asFilename physicalFileName  
+     '/foo/bar' asFilename physicalFileName
     "
 !
 
@@ -5200,54 +5203,54 @@
 
     info := self linkInfo.
     info isNil ifTrue:[
-        " I do not exist"
-        ^ nil.
+	" I do not exist"
+	^ nil.
     ].
     info isSymbolicLink ifFalse:[
-        ^ self pathName
+	^ self pathName
     ].
 
     t := self.
     [
-        path := info path.
-        path isNil ifTrue:[
-            "/ cannot happen
-            ^ nil
-        ].
-        path asFilename isAbsolute ifTrue:[
-            t := path asFilename
-        ] ifFalse:[
-            t := (self species named:t directoryName) construct:path.
-        ].
-        info := t linkInfo.
-        info isNil ifTrue:[
-            "t does not exist"
-             ^ nil
-        ].
+	path := info path.
+	path isNil ifTrue:[
+	    "/ cannot happen
+	    ^ nil
+	].
+	path asFilename isAbsolute ifTrue:[
+	    t := path asFilename
+	] ifFalse:[
+	    t := (self species named:t directoryName) construct:path.
+	].
+	info := t linkInfo.
+	info isNil ifTrue:[
+	    "t does not exist"
+	     ^ nil
+	].
     ] doWhile:[info isSymbolicLink].
 
     ^ t pathName
 
     "
-     '/foo/bar' asFilename physicalPathName  
-     '.' asFilename physicalPathName         
-     '../..' asFilename physicalPathName     
-     '/usr/tmp' asFilename physicalPathName           
+     '/foo/bar' asFilename physicalPathName
+     '.' asFilename physicalPathName
+     '../..' asFilename physicalPathName
+     '/usr/tmp' asFilename physicalPathName
     "
 
     "Modified: 21.12.1996 / 15:29:50 / cg"
 !
 
 tail
-    "the file's name without directory prefix as a string. 
+    "the file's name without directory prefix as a string.
      An alias for baseName, for ST-80 compatiblity."
 
     ^ self baseName
 
     "
-     Filename currentDirectory tail 
-     'Makefile' asFilename tail    
-     '/foo/bar/baz.st' asFilename tail  
+     Filename currentDirectory tail
+     'Makefile' asFilename tail
+     '/foo/bar/baz.st' asFilename tail
     "
 
     "Modified: 29.2.1996 / 20:19:50 / cg"
@@ -5269,41 +5272,41 @@
     components := self components.
     start := components size - nComponents + 1.
     start < 1 ifTrue:[
-        start := 1.
+	start := 1.
     ].
     start = 1 ifTrue:[
-        tail := ''
+	tail := ''
     ] ifFalse:[
-        tail := components at:start.
+	tail := components at:start.
     ].
     start+1 to:components size do:[:i|
-        tail := tail, sep, (components at:i).
+	tail := tail, sep, (components at:i).
     ].
-    ^ tail.    
-
-
-    "
-     '/foo/bar' asFilename tail:1  
-     '/foo/bar' asFilename tail:2  
-     '/foo/bar' asFilename tail:3  
-     '/foo/bar.cc' asFilename tail:2  
-     '.' asFilename tail:3          
-     '..' asFilename tail:3         
-     '../..' asFilename tail:2        
-     '../../libbasic' asFilename tail:2        
-     '../../libbasic' asFilename asCanonicalizedFilename tail:2        
-     '../../libpr' asFilename tail:2        
-     '../../libbasic/Object.st' asFilename asCanonicalizedFilename tail:2        
-     '/' asFilename tail:2        
-     '\' asFilename tail:2        
-     'c:\' asFilename tail:2        
-     '\\idefix' asFilename tail:2        
+    ^ tail.
+
+
+    "
+     '/foo/bar' asFilename tail:1
+     '/foo/bar' asFilename tail:2
+     '/foo/bar' asFilename tail:3
+     '/foo/bar.cc' asFilename tail:2
+     '.' asFilename tail:3
+     '..' asFilename tail:3
+     '../..' asFilename tail:2
+     '../../libbasic' asFilename tail:2
+     '../../libbasic' asFilename asCanonicalizedFilename tail:2
+     '../../libpr' asFilename tail:2
+     '../../libbasic/Object.st' asFilename asCanonicalizedFilename tail:2
+     '/' asFilename tail:2
+     '\' asFilename tail:2
+     'c:\' asFilename tail:2
+     '\\idefix' asFilename tail:2
     "
 !
 
 volume
     "return the disc volume part of the name or an empty string.
-     This is only used with MSDOS and VMS filenames 
+     This is only used with MSDOS and VMS filenames
      - by default (and on unix), an empty string is returned"
 
     ^ ''
@@ -5322,9 +5325,9 @@
     "
      '/foo/bar' asFilename isDirectory
      '/tmp' asFilename isDirectory
-     'Makefile' asFilename isDirectory   
-     'c:\' asFilename isDirectory   
-     'd:\' asFilename isDirectory   
+     'Makefile' asFilename isDirectory
+     'c:\' asFilename isDirectory
+     'd:\' asFilename isDirectory
     "
 
     "Modified: / 21.9.1998 / 15:53:10 / cg"
@@ -5335,20 +5338,20 @@
      readable directories pathname, and the directory is not empty."
 
     FileStream openErrorSignal
-        handle:[:ex| ]
-        do:[
-            self directoryContentsDo:[:pathString|^ true].
-        ].
+	handle:[:ex| ]
+	do:[
+	    self directoryContentsDo:[:pathString|^ true].
+	].
     ^ false.
 
     "
-     '/foo/bar' asFilename isNonEmptyDirectory 
+     '/foo/bar' asFilename isNonEmptyDirectory
      '/tmp' asFilename isNonEmptyDirectory
      '/tmp/empty' asFilename makeDirectory; isNonEmptyDirectory.
      '/tmp/empty' asFilename removeDirectory.
-     'Makefile' asFilename isNonEmptyDirectory   
-     'c:\' asFilename isNonEmptyDirectory   
-     'd:\' asFilename isNonEmptyDirectory   
+     'Makefile' asFilename isNonEmptyDirectory
+     'c:\' asFilename isNonEmptyDirectory
+     'd:\' asFilename isNonEmptyDirectory
     "
 
     "Modified: / 21.9.1998 / 15:53:10 / cg"
@@ -5362,10 +5365,10 @@
     "
      '/foo/bar' asFilename isRegularFile
      '/tmp' asFilename isRegularFile
-     'Makefile' asFilename isRegularFile   
-     'c:\' asFilename isRegularFile   
-     'd:\' asFilename isRegularFile   
-     '/dev/null' asFilename isRegularFile   
+     'Makefile' asFilename isRegularFile
+     'c:\' asFilename isRegularFile
+     'd:\' asFilename isRegularFile
+     '/dev/null' asFilename isRegularFile
     "
 !
 
@@ -5381,10 +5384,10 @@
     "
      '/foo/bar' asFilename isSpecialFile
      '/tmp' asFilename isSpecialFile
-     'Makefile' asFilename isSpecialFile   
-     'c:\' asFilename isSpecialFile   
-     'd:\' asFilename isSpecialFile   
-     '/dev/null' asFilename isSpecialFile   
+     'Makefile' asFilename isSpecialFile
+     'c:\' asFilename isSpecialFile
+     'd:\' asFilename isSpecialFile
+     '/dev/null' asFilename isSpecialFile
     "
 !
 
@@ -5396,8 +5399,8 @@
     ^ OperatingSystem isSymbolicLink:(self osNameForFile)
 
     "
-     'Make.proto' asFilename isSymbolicLink  
-     'Makefile' asFilename isSymbolicLink   
+     'Make.proto' asFilename isSymbolicLink
+     'Makefile' asFilename isSymbolicLink
     "
 ! !
 
@@ -5409,9 +5412,9 @@
      Returns nil for non-existing directories; however, this behavior
      may be changed in the near future, to raise an exception instead.
      So users of this method better test for existing directory before.
-     Notice: 
-        this returns the file-names as strings; 
-        see also #directoryContentsAsFilenames, which returns fileName instances."
+     Notice:
+	this returns the file-names as strings;
+	see also #directoryContentsAsFilenames, which returns fileName instances."
 
     |directoryStream contents|
 
@@ -5420,16 +5423,16 @@
     directoryStream isNil ifTrue:[^ nil].
 
     [
-        [directoryStream atEnd] whileFalse:[  
-            |entry|
-
-            entry := directoryStream nextLine.
-            (entry notNil and:[entry ~= '.' and:[entry ~= '..']]) ifTrue:[
-                contents add:entry
-            ].
-        ].
+	[directoryStream atEnd] whileFalse:[
+	    |entry|
+
+	    entry := directoryStream nextLine.
+	    (entry notNil and:[entry ~= '.' and:[entry ~= '..']]) ifTrue:[
+		contents add:entry
+	    ].
+	].
     ] ensure:[
-        directoryStream close
+	directoryStream close
     ].
 
     ^ contents.
@@ -5449,9 +5452,9 @@
      Returns nil for non-existing directories; however, this behavior
      may be changed in the near future, to raise an exception instead.
      So users of this method better test for existing directory before.
-     Notice: 
-        this returns the file-names as fileName instances; 
-        see also #directoryContents, which returns strings."
+     Notice:
+	this returns the file-names as fileName instances;
+	see also #directoryContents, which returns strings."
 
     |names|
 
@@ -5460,7 +5463,7 @@
     ^ names collect:[:entry | self construct:entry].
 
     "
-     '.' asFilename directoryContentsAsFilenames   
+     '.' asFilename directoryContentsAsFilenames
      '/XXXdoesNotExist' asFilename directoryContentsAsFilenames
     "
 !
@@ -5478,8 +5481,8 @@
     "here we get the files without '.' and '..'"
     files := self directoryContents.
     files isNil ifTrue:[
-        "/ mhmh - that one does not exist
-        ^ files
+	"/ mhmh - that one does not exist
+	^ files
     ].
 
     files addFirst:'..'.
@@ -5499,9 +5502,9 @@
      as a collection of strings.
      This excludes any entries for '.' or '..'.
      Subdirectory files are included with a relative pathname.
-     Notice: 
-        this returns the file-names as strings; 
-        see also #recursiveDirectoryContentsAsFilenames, which returns fileName instances.
+     Notice:
+	this returns the file-names as strings;
+	see also #recursiveDirectoryContentsAsFilenames, which returns fileName instances.
 
      Warning: this may take a long time to execute."
 
@@ -5510,25 +5513,25 @@
     fileNames := OrderedCollection new.
     dirNames := OrderedCollection new.
     self directoryContents do:[:f |
-        (self construct:f) isDirectory ifTrue:[
-            dirNames add:f
-        ] ifFalse:[
-            fileNames add:f
-        ]
+	(self construct:f) isDirectory ifTrue:[
+	    dirNames add:f
+	] ifFalse:[
+	    fileNames add:f
+	]
     ].
 
     dirNames do:[:dN |
-        |dd subFiles|
-
-        dd := dN asFilename.
-        subFiles := (self construct:dN) recursiveDirectoryContents.
-        fileNames addAll:(subFiles collect:[:f | dd constructString:f])
+	|dd subFiles|
+
+	dd := dN asFilename.
+	subFiles := (self construct:dN) recursiveDirectoryContents.
+	fileNames addAll:(subFiles collect:[:f | dd constructString:f])
     ].
     ^ fileNames.
 
     "
-     '.' asFilename recursiveDirectoryContents 
-     '../../clients' asFilename recursiveDirectoryContents 
+     '.' asFilename recursiveDirectoryContents
+     '../../clients' asFilename recursiveDirectoryContents
     "
 !
 
@@ -5539,9 +5542,9 @@
      Returns nil for non-existing directories; however, this behavior
      may be changed in the near future, to raise an exception instead.
      So users of this method better test for existing directory before.
-     Notice: 
-        this returns the file-names as fileName instances; 
-        see also #recursiveDirectoryContents, which returns strings.
+     Notice:
+	this returns the file-names as fileName instances;
+	see also #recursiveDirectoryContents, which returns strings.
 
      Warning: this may take a long time to execute."
 
@@ -5552,7 +5555,7 @@
     ^ names collect:[:entry | self construct:entry].
 
     "
-     '.' asFilename recursiveDirectoryContentsAsFilenames   
+     '.' asFilename recursiveDirectoryContentsAsFilenames
      '/XXXdoesNotExist' asFilename recursiveDirectoryContentsAsFilenames
     "
 ! !
@@ -5562,30 +5565,30 @@
 binaryContentsOfEntireFile
     "return the binary contents of the file (as a byteArray);
      Raises an error, if the file is unreadable/non-existing."
-    
-    ^ self 
-        readingFileDo:[:s | 
-            |nBytes bytes n result|
-
-            s binary.
-            nBytes := self fileSize.
-            (nBytes notNil and:[ nBytes ~~ 0 ]) ifTrue:[
-                bytes := ByteArray uninitializedNew:nBytes.
-                n := s nextBytes:nBytes into:bytes startingAt:1.
-                n == nBytes ifTrue:[
-                    result := bytes
-                ] ifFalse:[
-                    result := bytes copyTo:n
-                ]
-            ] ifFalse:[
-                result := s contentsOfEntireFile
-            ].
-            result
-        ]
+
+    ^ self
+	readingFileDo:[:s |
+	    |nBytes bytes n result|
+
+	    s binary.
+	    nBytes := self fileSize.
+	    (nBytes notNil and:[ nBytes ~~ 0 ]) ifTrue:[
+		bytes := ByteArray uninitializedNew:nBytes.
+		n := s nextBytes:nBytes into:bytes startingAt:1.
+		n == nBytes ifTrue:[
+		    result := bytes
+		] ifFalse:[
+		    result := bytes copyTo:n
+		]
+	    ] ifFalse:[
+		result := s contentsOfEntireFile
+	    ].
+	    result
+	]
 
     "
      'Makefile' asFilename binaryContentsOfEntireFile
-     'foobar' asFilename binaryContentsOfEntireFile   
+     'foobar' asFilename binaryContentsOfEntireFile
     "
 
     "Modified: / 27-10-2012 / 19:42:07 / cg"
@@ -5601,7 +5604,7 @@
 
     "
      'Makefile' asFilename contents
-     'foobar' asFilename contents            
+     'foobar' asFilename contents
     "
 
     "Modified: / 2.7.1996 / 12:49:45 / stefan"
@@ -5643,7 +5646,7 @@
 
 readingFileDo:aBlock
     "create a read-stream on the receiver file, evaluate aBlock, passing that stream as arg,
-     and return the blocks value. 
+     and return the blocks value.
      If the file cannot be opened, an exception is raised or
      (old behavior, will vanish:)the block is evaluated with a nil argument.
      Ensures that the stream is closed."
@@ -5652,9 +5655,9 @@
 
     stream := self readStream.
     [
-        result := aBlock value:stream
+	result := aBlock value:stream
     ] ensure:[
-        stream notNil ifTrue:[stream close]
+	stream notNil ifTrue:[stream close]
     ].
     ^ result
 
@@ -5663,11 +5666,11 @@
 
      |rslt|
 
-     rslt := 
-        '/etc/passwd' asFilename 
-            readingFileDo:[:s |
-                s nextLine
-            ]. 
+     rslt :=
+	'/etc/passwd' asFilename
+	    readingFileDo:[:s |
+		s nextLine
+	    ].
      Transcript showCR:rslt.
     "
 
@@ -5677,21 +5680,21 @@
      |rslt|
 
      rslt :=
-        '/etc/passwd' asFilename 
-            readingFileDo:
-                [:s |
-                    |shells|
-
-                    shells := Bag new.
-                    s linesDo:
-                        [:line |
-                            |parts|
-
-                            parts := line asCollectionOfSubstringsSeparatedBy:$:.
-                            shells add:(parts seventh).
-                        ].
-                    shells contents
-                ].           
+	'/etc/passwd' asFilename
+	    readingFileDo:
+		[:s |
+		    |shells|
+
+		    shells := Bag new.
+		    s linesDo:
+			[:line |
+			    |parts|
+
+			    parts := line asCollectionOfSubstringsSeparatedBy:$:.
+			    shells add:(parts seventh).
+			].
+		    shells contents
+		].
      Transcript showCR:rslt.
     "
 !
@@ -5703,21 +5706,21 @@
      Ensures that the stream is closed."
 
     self readingFileDo:[:stream |
-        stream linesDo:aBlock
+	stream linesDo:aBlock
     ].
 
     "
-    '/etc/passwd' asFilename 
-        readingLinesDo:[:eachLine |
-            Transcript showCR:eachLine.
-        ]. 
-    "
-
-    "
-    '/etc/xxxxx' asFilename 
-        readingLinesDo:[:eachLine |
-            Transcript showCR:eachLine.
-        ]. 
+    '/etc/passwd' asFilename
+	readingLinesDo:[:eachLine |
+	    Transcript showCR:eachLine.
+	].
+    "
+
+    "
+    '/etc/xxxxx' asFilename
+	readingLinesDo:[:eachLine |
+	    Transcript showCR:eachLine.
+	].
     "
 ! !
 
@@ -5727,7 +5730,7 @@
     "special - return the OS's name for the receiver."
 
     self isDirectory ifTrue:[
-        ^ self osNameForDirectory
+	^ self osNameForDirectory
     ].
     ^ self osNameForFile
 !
@@ -5768,17 +5771,17 @@
      access it as a file."
 
     (nameString startsWith:'~') ifFalse:[
-        ^ nameString.
+	^ nameString.
     ].
 
-    ^ self species nameWithSpecialExpansions:nameString. 
+    ^ self species nameWithSpecialExpansions:nameString.
 ! !
 
 !Filename methodsFor:'suffixes'!
 
 addSuffix:aSuffix
     "return a new filename for the receivers name with a additional suffix.
-     The new suffix is simply appended to the name, 
+     The new suffix is simply appended to the name,
      regardless whether there is already an existing suffix.
      See also #withSuffix:"
 
@@ -5786,37 +5789,37 @@
 
     prefixName := self name.
     aSuffix isEmptyOrNil ifTrue:[
-        ^ self species named:prefixName
+	^ self species named:prefixName
     ].
 
     ^ self species named:
-        (prefixName 
-         , self species suffixSeparator asString 
-         , aSuffix asString)
-
-    "
-     'abc.st' asFilename addSuffix:nil         
-     'a.b.c' asFilename addSuffix:nil            
-     '.b.c.' asFilename addSuffix:nil            
-     '.b.c' asFilename addSuffix:nil            
-     '.c.' asFilename addSuffix:nil            
-     '.c' asFilename addSuffix:nil            
-     'c.' asFilename addSuffix:nil            
-     '.' asFilename addSuffix:nil            
-
-     'abc.st' asFilename addSuffix:'o'         
-     'abc' asFilename addSuffix:'o'             
-     'a.b.c' asFilename addSuffix:'o'            
-     'a.b.c.' asFilename addSuffix:'o'            
-     '.b.c.' asFilename addSuffix:'o'            
-     '.c.' asFilename addSuffix:'o'            
-     '.c' asFilename addSuffix:'o'            
-     'c.' asFilename addSuffix:'o'            
-     '.' asFilename addSuffix:'o'            
-     '/foo/bar/baz.st' asFilename addSuffix:'c'   
-     '/foo/bar/baz.c' asFilename addSuffix:'st'   
-     '/foo/bar.c/baz.c' asFilename addSuffix:'st'   
-     '/foo/bar.c/baz' asFilename addSuffix:'st'   
+	(prefixName
+	 , self species suffixSeparator asString
+	 , aSuffix asString)
+
+    "
+     'abc.st' asFilename addSuffix:nil
+     'a.b.c' asFilename addSuffix:nil
+     '.b.c.' asFilename addSuffix:nil
+     '.b.c' asFilename addSuffix:nil
+     '.c.' asFilename addSuffix:nil
+     '.c' asFilename addSuffix:nil
+     'c.' asFilename addSuffix:nil
+     '.' asFilename addSuffix:nil
+
+     'abc.st' asFilename addSuffix:'o'
+     'abc' asFilename addSuffix:'o'
+     'a.b.c' asFilename addSuffix:'o'
+     'a.b.c.' asFilename addSuffix:'o'
+     '.b.c.' asFilename addSuffix:'o'
+     '.c.' asFilename addSuffix:'o'
+     '.c' asFilename addSuffix:'o'
+     'c.' asFilename addSuffix:'o'
+     '.' asFilename addSuffix:'o'
+     '/foo/bar/baz.st' asFilename addSuffix:'c'
+     '/foo/bar/baz.c' asFilename addSuffix:'st'
+     '/foo/bar.c/baz.c' asFilename addSuffix:'st'
+     '/foo/bar.c/baz' asFilename addSuffix:'st'
     "
 !
 
@@ -5828,16 +5831,16 @@
 
     mySuffix := self suffix.
     self species isCaseSensitive ifTrue:[
-        ^ mySuffix = aSuffixString
+	^ mySuffix = aSuffixString
     ].
     ^ mySuffix asLowercase = aSuffixString asLowercase
 
     "
-     'abc.st' asFilename hasSuffix:'st'   
-     'abc.ST' asFilename hasSuffix:'st'   
+     'abc.st' asFilename hasSuffix:'st'
+     'abc.ST' asFilename hasSuffix:'st'
      '.ST' asFilename hasSuffix:'st'              -- false expected here
      '.foorc' asFilename hasSuffix:'foorc'        -- false expected here
-     '.foorc.sav' asFilename hasSuffix:'sav'   
+     '.foorc.sav' asFilename hasSuffix:'sav'
     "
 
     "Modified: 7.9.1997 / 02:55:25 / cg"
@@ -5862,23 +5865,23 @@
     ^ nameString copyTo:(idx - 1)
 
     "
-     'abc.st' asFilename nameWithoutSuffix         
-     'abc' asFilename nameWithoutSuffix            
-     '/abc' asFilename nameWithoutSuffix            
-     '/abc.d' asFilename nameWithoutSuffix            
-     './abc' asFilename nameWithoutSuffix            
-     './abc.d' asFilename nameWithoutSuffix            
-     './.abc' asFilename nameWithoutSuffix            
-     'a.b.c' asFilename nameWithoutSuffix           
-     'a.b.' asFilename nameWithoutSuffix           
-     '.b.c' asFilename nameWithoutSuffix           
-     '.b.' asFilename nameWithoutSuffix           
-     '.b' asFilename nameWithoutSuffix           
-     '/foo/bar/baz.c' asFilename nameWithoutSuffix     
-     '/foo/bar.x/baz.c' asFilename nameWithoutSuffix     
-     '/foo/bar.x/baz' asFilename nameWithoutSuffix     
-     '/foo/bar/baz/foo.c/bar' asFilename nameWithoutSuffix   
-     '/foo/bar/baz/foo.c/bar.c' asFilename nameWithoutSuffix   
+     'abc.st' asFilename nameWithoutSuffix
+     'abc' asFilename nameWithoutSuffix
+     '/abc' asFilename nameWithoutSuffix
+     '/abc.d' asFilename nameWithoutSuffix
+     './abc' asFilename nameWithoutSuffix
+     './abc.d' asFilename nameWithoutSuffix
+     './.abc' asFilename nameWithoutSuffix
+     'a.b.c' asFilename nameWithoutSuffix
+     'a.b.' asFilename nameWithoutSuffix
+     '.b.c' asFilename nameWithoutSuffix
+     '.b.' asFilename nameWithoutSuffix
+     '.b' asFilename nameWithoutSuffix
+     '/foo/bar/baz.c' asFilename nameWithoutSuffix
+     '/foo/bar.x/baz.c' asFilename nameWithoutSuffix
+     '/foo/bar.x/baz' asFilename nameWithoutSuffix
+     '/foo/bar/baz/foo.c/bar' asFilename nameWithoutSuffix
+     '/foo/bar/baz/foo.c/bar.c' asFilename nameWithoutSuffix
     "
 
     "Modified: / 07-09-1995 / 11:15:42 / claus"
@@ -5893,12 +5896,12 @@
     ^ self prefixAndSuffix at:1
 
     "
-     'abc.st' asFilename prefix   
-     'abc' asFilename prefix      
-     'a.b.c' asFilename prefix    
-     'a.b.c' asFilename prefix    
-     'a.' asFilename prefix    
-     '.a' asFilename prefix    
+     'abc.st' asFilename prefix
+     'abc' asFilename prefix
+     'a.b.c' asFilename prefix
+     'a.b.c' asFilename prefix
+     'a.' asFilename prefix
+     '.a' asFilename prefix
     "
 
     "Modified: / 07-09-1995 / 11:09:03 / claus"
@@ -5917,9 +5920,9 @@
      that part is NOT considered a suffix. Thus, '.foorc' has no suffix and a prefix of
      '.foorc'.
      See also: #withoutSuffix and #withSuffix
-     Notice: 
-        there is currently no known system which uses other than
-        the period character as suffixCharacter."
+     Notice:
+	there is currently no known system which uses other than
+	the period character as suffixCharacter."
 
     |nm idx|
 
@@ -5928,23 +5931,23 @@
     "/ be careful: if the name consists only of suffix (i.e '.foo'),
     "/ the suffix is considered empty.
     ((idx == 1) or:[ idx == 0 ]) ifTrue:[
-        ^ Array with:nm with:''
+	^ Array with:nm with:''
     ].
-    ^ Array 
-        with:(nm copyTo:idx-1)
-        with:(nm copyFrom:idx+1)
-
-    "
-     'abc.st' asFilename prefixAndSuffix  
-     'abc' asFilename prefixAndSuffix  
-     'a.b.c' asFilename prefixAndSuffix 
-     '/foo/bar.c/baz.c' asFilename prefixAndSuffix 
-     'a.' asFilename prefixAndSuffix    
-     '.a' asFilename prefixAndSuffix    
-
-     |parts| 
+    ^ Array
+	with:(nm copyTo:idx-1)
+	with:(nm copyFrom:idx+1)
+
+    "
+     'abc.st' asFilename prefixAndSuffix
+     'abc' asFilename prefixAndSuffix
+     'a.b.c' asFilename prefixAndSuffix
+     '/foo/bar.c/baz.c' asFilename prefixAndSuffix
+     'a.' asFilename prefixAndSuffix
+     '.a' asFilename prefixAndSuffix
+
+     |parts|
      parts := 'Object.st' asFilename prefixAndSuffix.
-     ((parts at:1) , '.o') asFilename   
+     ((parts at:1) , '.o') asFilename
     "
 
     "Modified: 7.9.1995 / 11:15:42 / claus"
@@ -5959,12 +5962,12 @@
     ^ self prefixAndSuffix at:2
 
     "
-     'abc.st' asFilename suffix   
-     'abc' asFilename suffix      
-     'a.b.c' asFilename suffix    
-     'a.b.c' asFilename suffix    
-     'a.' asFilename suffix    
-     '.a' asFilename suffix    
+     'abc.st' asFilename suffix
+     'abc' asFilename suffix
+     'a.b.c' asFilename suffix
+     'a.b.c' asFilename suffix
+     'a.' asFilename suffix
+     '.a' asFilename suffix
     "
 
     "Modified: 7.9.1995 / 11:09:03 / claus"
@@ -5979,37 +5982,37 @@
 
     prefixName := self nameWithoutSuffix.
     aSuffix isEmptyOrNil ifTrue:[
-        ^ self species named:prefixName
+	^ self species named:prefixName
     ].
 
     ^ self species named:
-        (prefixName 
-         , self class suffixSeparator asString 
-         , aSuffix asString)
-
-    "
-     'abc.st' asFilename withSuffix:nil         
-     'a.b.c' asFilename withSuffix:nil            
-     '.b.c.' asFilename withSuffix:nil            
-     '.b.c' asFilename withSuffix:nil            
-     '.c.' asFilename withSuffix:nil            
-     '.c' asFilename withSuffix:nil            
-     'c.' asFilename withSuffix:nil            
-     '.' asFilename withSuffix:nil            
-
-     'abc.st' asFilename withSuffix:'o'         
-     'abc' asFilename withSuffix:'o'             
-     'a.b.c' asFilename withSuffix:'o'            
-     'a.b.c.' asFilename withSuffix:'o'            
-     '.b.c.' asFilename withSuffix:'o'            
-     '.c.' asFilename withSuffix:'o'            
-     '.c' asFilename withSuffix:'o'            
-     'c.' asFilename withSuffix:'o'            
-     '.' asFilename withSuffix:'o'            
-     '/foo/bar/baz.st' asFilename withSuffix:'c'   
-     '/foo/bar/baz.c' asFilename withSuffix:'st'   
-     '/foo/bar.c/baz.c' asFilename withSuffix:'st'   
-     '/foo/bar.c/baz' asFilename withSuffix:'st'   
+	(prefixName
+	 , self class suffixSeparator asString
+	 , aSuffix asString)
+
+    "
+     'abc.st' asFilename withSuffix:nil
+     'a.b.c' asFilename withSuffix:nil
+     '.b.c.' asFilename withSuffix:nil
+     '.b.c' asFilename withSuffix:nil
+     '.c.' asFilename withSuffix:nil
+     '.c' asFilename withSuffix:nil
+     'c.' asFilename withSuffix:nil
+     '.' asFilename withSuffix:nil
+
+     'abc.st' asFilename withSuffix:'o'
+     'abc' asFilename withSuffix:'o'
+     'a.b.c' asFilename withSuffix:'o'
+     'a.b.c.' asFilename withSuffix:'o'
+     '.b.c.' asFilename withSuffix:'o'
+     '.c.' asFilename withSuffix:'o'
+     '.c' asFilename withSuffix:'o'
+     'c.' asFilename withSuffix:'o'
+     '.' asFilename withSuffix:'o'
+     '/foo/bar/baz.st' asFilename withSuffix:'c'
+     '/foo/bar/baz.c' asFilename withSuffix:'st'
+     '/foo/bar.c/baz.c' asFilename withSuffix:'st'
+     '/foo/bar.c/baz' asFilename withSuffix:'st'
     "
 
     "Modified: / 07-09-1995 / 11:15:42 / claus"
@@ -6027,23 +6030,23 @@
     ^ self species named:n
 
     "
-     'abc.st' asFilename withoutSuffix         
-     'abc' asFilename withoutSuffix            
-     '/abc' asFilename withoutSuffix            
-     '/abc.d' asFilename withoutSuffix            
-     './abc' asFilename withoutSuffix            
-     './abc.d' asFilename withoutSuffix            
-     './.abc' asFilename withoutSuffix            
-     'a.b.c' asFilename withoutSuffix           
-     'a.b.' asFilename withoutSuffix           
-     '.b.c' asFilename withoutSuffix           
-     '.b.' asFilename withoutSuffix           
-     '.b' asFilename withoutSuffix           
-     '/foo/bar/baz.c' asFilename withoutSuffix     
-     '/foo/bar.x/baz.c' asFilename withoutSuffix     
-     '/foo/bar.x/baz' asFilename withoutSuffix     
-     '/foo/bar/baz/foo.c/bar' asFilename withoutSuffix   
-     '/foo/bar/baz/foo.c/bar.c' asFilename withoutSuffix   
+     'abc.st' asFilename withoutSuffix
+     'abc' asFilename withoutSuffix
+     '/abc' asFilename withoutSuffix
+     '/abc.d' asFilename withoutSuffix
+     './abc' asFilename withoutSuffix
+     './abc.d' asFilename withoutSuffix
+     './.abc' asFilename withoutSuffix
+     'a.b.c' asFilename withoutSuffix
+     'a.b.' asFilename withoutSuffix
+     '.b.c' asFilename withoutSuffix
+     '.b.' asFilename withoutSuffix
+     '.b' asFilename withoutSuffix
+     '/foo/bar/baz.c' asFilename withoutSuffix
+     '/foo/bar.x/baz.c' asFilename withoutSuffix
+     '/foo/bar.x/baz' asFilename withoutSuffix
+     '/foo/bar/baz/foo.c/bar' asFilename withoutSuffix
+     '/foo/bar/baz/foo.c/bar.c' asFilename withoutSuffix
     "
 
     "Modified: / 07-09-1995 / 11:15:42 / claus"
@@ -6065,7 +6068,7 @@
 
 appendingFileDo:aBlock
     "create a append-stream on the receiver file, evaluate aBlock, passing that stream as arg,
-     and return the blocks value. 
+     and return the blocks value.
      If the file cannot be opened, an exception is raised.
      Ensures that the stream is closed."
 
@@ -6073,17 +6076,17 @@
 
     stream := self appendStream.
     [
-        result := aBlock value:stream
+	result := aBlock value:stream
     ] ensure:[
-        stream close
+	stream close
     ].
     ^ result
 
     "
      'ttt' asFilename appendingFileDo:[:s |
-        s nextPutLine:'hello'.
-        s nextPutLine:'world'.
-     ]           
+	s nextPutLine:'hello'.
+	s nextPutLine:'world'.
+     ]
     "
 
     "Created: / 09-11-2012 / 10:07:41 / sr"
@@ -6093,24 +6096,24 @@
     "create (or overwrite) a file given its contents as a collection of lines.
      Raises an error, if the file is unwritable."
 
-    ^ self 
-        writingFileDo:[:s |
-            aStringOrCollectionOfLines isNonByteCollection ifTrue:[
-                "a StringCollection or a collection of lines"
-                aStringOrCollectionOfLines do:[:each | s nextPutLine:(each ? '')]
-            ] ifFalse:[
-                "something string-like"
-                aStringOrCollectionOfLines isString ifFalse:[
-                    s binary
-                ].
-                s nextPutAll:aStringOrCollectionOfLines
-            ]
-        ].
-
-    "
-     'foo1' asFilename contents:#('one' 'two' 'three')            
-     'foo2' asFilename contents:'Hello world'            
-     'foo3' asFilename contents:#[1 2 3 4 5]          
+    ^ self
+	writingFileDo:[:s |
+	    aStringOrCollectionOfLines isNonByteCollection ifTrue:[
+		"a StringCollection or a collection of lines"
+		aStringOrCollectionOfLines do:[:each | s nextPutLine:(each ? '')]
+	    ] ifFalse:[
+		"something string-like"
+		aStringOrCollectionOfLines isString ifFalse:[
+		    s binary
+		].
+		s nextPutAll:aStringOrCollectionOfLines
+	    ]
+	].
+
+    "
+     'foo1' asFilename contents:#('one' 'two' 'three')
+     'foo2' asFilename contents:'Hello world'
+     'foo3' asFilename contents:#[1 2 3 4 5]
     "
 
     "Created: / 11-12-2006 / 14:11:21 / cg"
@@ -6119,7 +6122,7 @@
 
 writingFileDo:aBlock
     "create a write-stream on the receiver file, evaluate aBlock, passing that stream as arg,
-     and return the blocks value. 
+     and return the blocks value.
      If the file cannot be opened, an exception is raised.
      Ensures that the stream is closed."
 
@@ -6127,16 +6130,16 @@
 
     stream := self writeStream.
     [
-        result := aBlock value:stream
+	result := aBlock value:stream
     ] ensure:[
-        stream close
+	stream close
     ].
     ^ result
 
     "
      'ttt' asFilename writingFileDo:[:s |
-        s nextPutLine:'hello'.
-        s nextPutLine:'world'.
+	s nextPutLine:'hello'.
+	s nextPutLine:'world'.
      ]
     "