hg/stx-libbasic: comparison Filename.st

equal deleted inserted replaced

-:cb7a12afe736
+:e3a375d5f6a8
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 "{ Package: 'stx:libbasic' }"
+"{ NameSpace: Smalltalk }"
 Object subclass:#Filename
 	instanceVariableNames:'nameString'
 	classVariableNames:'TempDirectory DefaultTempDirectory ConcreteClass'
 	poolDictionaries:''
 "Modified: / 29-08-2006 / 12:40:28 / cg"
 ! !
 !Filename class methodsFor:'instance creation'!
+applicationDataDirectory
+"return the directory, where user-and-application-specific private files are to be
+located (ini-files, preferences etc.).
+Under windows, something like 'C:\Users\Administrator\AppData\Roaming\<appName>'
+is returned, under unix, we use ~/.<appName> (but see details in UnixOS).
+For smalltalk itself (the IDE), 'smalltalk' is used as appName.
+If the directory does not exist, it is created"
+|exeName|
+Smalltalk isStandAloneApp ifTrue:[
+exeName := OperatingSystem nameOfSTXExecutable.
+] ifFalse:[
+exeName := 'smalltalk'
+].
+^ self applicationDataDirectoryFor:exeName
+"
+Filename applicationDataDirectory
+"
+!
 applicationDataDirectoryFor:appName
 "return the directory, where user-and-application-specific private files are to be
 located (ini-files, preferences etc.).
 Under windows, something like 'C:\Users\Administrator\AppData\Roaming\<appName>'
 is returned, under unix, we use ~/.<appName> (but see details in UnixOS).
 dir makeDirectory
 ].
 ^ dir
 "
+Filename applicationDataDirectoryFor:'smalltalk'
 Filename applicationDataDirectoryFor:'expecco'
+applicationDataDirectoryFor:'expecco'
 "
 "Created: / 29-07-2010 / 12:05:35 / sr"
 !
 !
 defaultTempDirectory
 "return the default temp directory as a filename.
 That is the same as TempDirectory, except that TempDirectory can be changed
-from the outside (via tempDirectory:).
+from the outside (via tempDirectory:) whereas this is the OS's original default.
 Use this for files which MUST remain the same (stx_sourceCache)"
 DefaultTempDirectory isNil ifTrue:[
-self tempDirectory.
+self tempDirectory.  "/ actually sets DefaultTempDirectory as side effect
 DefaultTempDirectory isNil ifTrue:[
 DefaultTempDirectory := TempDirectory
 ].
 ].
 !
 homeDirectory
 "return your homeDirectory.
 Some OperatingSystems do not support this - on those, the defaultDirectory
-(which is the currentDirectory) is returned."
+(which is the currentDirectory) is returned.
+Notice: services under windows also do not have a home directory."
 |s|
 s := OperatingSystem getHomeDirectory.
 s isNil ifTrue:[
 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.
-DO NOT USE THIS FOR PLAIN FILES - IT IS UNSECURE use FileStream>>#newTemporary"
+DO NOT USE THIS FOR PLAIN FILES - IT IS UNSECURE use FileStream>>#newTemporary
+(the insecurity is due to a small chance for some other program to open/create
+the file, as only a name is generated here. However, chances are small as the name
+is reasonably random - but for security relevant applications, this may be relevant)
+"
 ^ self newTemporaryIn:(self tempDirectory)
 "
 Filename newTemporary
 TMPDIR environment variable to have her temp files somewhere else."
 |tempDir|
 TempDirectory isNil ifTrue:[
-#('STX_TMPDIR' 'ST_TMPDIR' 'TMPDIR' 'TEMPDIR' 'TEMP' 'TMP') do:[:envVar |
+tempDir := self named:(self defaultTempDirectoryName pathName).
-tempDir isNil ifTrue:[
+tempDir exists ifFalse:[
-tempDir := OperatingSystem getEnvironment:envVar.
+tempDir
-tempDir notNil ifTrue:[
+makeDirectory;
-tempDir := self named:tempDir.
+addAccessRights:#(readUser readGroup readOthers
-tempDir exists ifFalse:[
+writeUser writeGroup writeOthers
-tempDir := nil.
+executeUser executeGroup executeOthers
-].
+removeOnlyByOwner).
-].
-].
-].
-tempDir 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'.
 ].
 "Make sure, that the TempDirectory exists - it might have been removed
 "Created: / 07-03-1996 / 14:51:18 / cg"
 "Modified: / 07-10-2011 / 18:39:25 / cg"
 !
 tempDirectory:aFilename
-"set the xdefault temporary directory pathname"
+"set the default temporary directory.
+This allows overwriting the automatically determined tmpDirectory
+by a knowledgable stand alone startup program.
+Do not use elsewhere (and only if absolutely requried)"
 |temp|
 aFilename isNil ifTrue:[
 TempDirectory := nil.
 ].
 temp := aFilename asFilename.
 self assert:temp isDirectory.
 TempDirectory := temp.
+!
+trashDirectoryOrNil
+"if the underlying OS uses/supports a trash folder,
+return it. Otherwise return nil.
+Asks the OS for the pathname; for example, on OSX, '~/.Trash' is returned."
+|s|
+s := OperatingSystem getTrashDirectory.
+s isNil ifTrue:[
+^ nil
+].
+^ self named:s
+"
+Filename desktopDirectory
+"
+"Created: / 16-05-2007 / 13:18:34 / cg"
+!
+usersPrivateSmalltalkDirectory
+^ Filename homeDirectory / '.smalltalk'
+"
+Filename usersPrivateSmalltalkDirectory
+"
 ! !
 !Filename class methodsFor:'defaults'!
 concreteClass
 "Modified: 8.9.1997 / 00:24:53 / cg"
 ! !
 !Filename class methodsFor:'misc'!
-canonicalize:aPathString
-"convert the argument, aPathString to a good format.
-This should eliminate useless directory components (i.e. '././')
-and useless tree walks (i.e. '../foo/..')."
-|comps newComps parentName currentName rootName|
-parentName := self parentDirectoryName.
-currentName := self currentDirectoryName.
-rootName := self rootDirectory name.
-comps := self components:aPathString.
-newComps := OrderedCollection new.
-comps do:[:eachComponent |
-(eachComponent ~= currentName
-and:[eachComponent notEmpty or:[newComps size == 1]]) ifTrue:[
-eachComponent = parentName ifTrue:[
-(newComps isEmpty
-or:[newComps = (Array with:rootName)
-or:[newComps last = parentName]]) ifTrue:[
-newComps add:eachComponent
-] ifFalse:[
-newComps removeLast
-].
-] ifFalse:[
-newComps add:eachComponent
-].
-]
-].
-"/ add current Directory if empty
-newComps isEmpty ifTrue:[
-newComps add:currentName.
-].
-^ self nameFromComponents:newComps
-"
-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'
-"
-!
 filterSeps:aFilenameString
 "ST80 compatibility:
 filter out (invalid) separators in aFilenameString.
 We recommend using #makeLegalFilename"
-^ aFilenameString copyReplaceAll:(Character space) with:$_.
+^ aFilenameString copyReplaceAll:(Character space) with:$_ ifNone:aFilenameString.
 "Created: / 1.11.1997 / 12:39:50 / cg"
 "Modified: / 18.7.1998 / 22:53:24 / cg"
 !
 PCFilename new nameWithSpecialExpansions:'~foo'
 PCFilename new nameWithSpecialExpansions:'~foo\bar'
 "
 !
+possiblyQuotedPathname:aPath
+"return a filename path usable as command line argument,
+by quoting in double quotes if there are any embedded special characters.
+On Unix systems, special characters might also be prefixed by a backslash character."
+(aPath startsWith:'"') ifFalse:[
+(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,
 which is legal on the current platform."
 ^ self canonicalize:aFilenameString
 "Created: / 1.11.1997 / 12:42:39 / cg"
 ! !
 !Filename class methodsFor:'queries'!
-components:aString
-"separate the pathName given by aString into
-a collection containing the directory components and the files name as
-the final component.
-If the argument names an absolute path, the first component will be the
-name of the root directory (i.e. '/')."
-|sep f vol rest components|
-self isAbstract ifTrue:[
-^ ConcreteClass components:aString
-].
-"/ the following works on Unix & MSDOS (but not on openVMS)
-"/ However, MSDOS drive-letters and network drives are
-"/ not correctly handled here.
-sep := self separator.
-f := aString asFilename.
-vol := f volume.
-vol size ~~ 0 ifTrue:[
-rest := f localPathName.
-] ifFalse:[
-rest := aString
-].
-components := rest asCollectionOfSubstringsSeparatedBy:sep.
-components first isEmpty ifTrue:[
-components at:1 put:(sep asString)
-].
-"/ prepend volume to first component (the root directory)
-vol size ~~ 0 ifTrue:[
-components at:1 put:(vol , (components at:1)).
-].
-components last isEmpty ifTrue:[
-^ components copyButLast:1
-].
-^ components
-"
-Filename components:'/foo/bar/baz'
-Filename components:'/'
-Filename components:'foo/bar/baz'
-Filename components:'foo/bar'
-Filename components:'foo'
-Filename components:'/foo'
-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"
-!
 currentDirectoryName
 "return a filename for the current directory"
 self isAbstract ifTrue:[
 "
 ! !
 !Filename class methodsFor:'utilities'!
+canonicalize:aPathString
+"convert the argument, aPathString to a good format.
+This should eliminate useless directory components (i.e. '././')
+and useless tree walks (i.e. '../foo/..')."
+^ 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'
+"
+!
+canonicalizedNameComponents:aPathString
+"convert the argument, aPathString to a good format.
+This should eliminate useless directory components (i.e. '././')
+and useless tree walks (i.e. '../foo/..').
+Answer a sequenceable collection of name components."
+|comps newComps rootName dotDot dot|
+dotDot := self parentDirectoryName.
+dot := self currentDirectoryName.
+rootName := self separatorString.
+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
+].
+]
+].
+"/ add current Directory if empty
+newComps isEmpty ifTrue:[
+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'
+"
+!
+components:aString
+"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
+name of the root directory (i.e. '/')."
+|sep f vol rest components|
+self isAbstract ifTrue:[
+^ ConcreteClass components:aString
+].
+"/ the following works on Unix & MSDOS (but not on openVMS)
+"/ However, MSDOS drive-letters and network drives are
+"/ not correctly handled here.
+sep := self separator.
+f := aString asFilename.
+vol := f volume.
+vol size ~~ 0 ifTrue:[
+rest := f localPathName.
+] ifFalse:[
+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.
+].
+].
+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
+"
+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.
 If the first component is the name of the root directory (i.e. '/'),
 an absolute path-string is returned."
 "
 ! !
 !Filename methodsFor:'comparing'!
+< aFilename
+"compare file names - used for sorting"
+^ self asString < aFilename asString
+!
 = aFilename
 "return true, if the argument represents the same filename"
 |str|
 !
 contentsIsPrefixOf:aFilename
 "return true if the contents of the file represented by the receiver
 is the same as or a prefix of the contents of the file represented by the argument, aFilename.
-This compares the files actual contents; not the filenames."
+This compares the files' actual contents; not the filenames."
 |f2 s1 s2 bufferSize buffer1 buffer2 n|
 bufferSize := 8192 * 4.
 !
 contentsStartsWithContentsOf:aFilename
 "return true if the contents of the file represented by aFilename
 is the same as or a prefix of the contents of the file represented by the receiver.
-This compares the files actual contents; not the filenames."
+This compares the files' actual contents; not the filenames."
 ^ aFilename asFilename contentsIsPrefixOf:self
 "
 |s|
 !
 sameContentsAs:aFilename
 "return true if the file represented by the receiver has the
 same contents as the file represented by the argument, aFilename.
-This compares the files actual contents; not the filenames."
+This compares the file's actual contents; not the filenames."
 |f2|
 f2 := aFilename asFilename.
 f2 fileSize = self fileSize ifFalse:[^ false].
 "
 actually, in Unix spaces are allowed - but it makes life
 so hard; therefore, replace them by underscores ...
 "
-(nameString includes:Character space) ifTrue:[
+nameString := nameString copyReplaceAll:(Character space) with:$_ ifNone:nameString.
-nameString := nameString copyReplaceAll:(Character space) with:$_.
-].
 "
 need more - especially on SYS5.3 type systems,
 we may want to contract the fileName to 14 characters.
 "
 ^ self
 !
 directories
 "return a collection of directories contained in the directory represented by the receiver."
-^ self directoryContentsAsFilenames
+|collection|
-select:[:eachFileOrDirectory | eachFileOrDirectory isDirectory]
+collection := OrderedCollection new.
+self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
+eachFileOrDirectory isDirectory ifTrue:[
+collection add:eachFileOrDirectory.
+].
+].
+^ collection
 "
 '.' asFilename directories.
 "
 "evaluate aBlock for directories contained in the directory represented by the receiver.
 The block is invoked with a filename-arguments.
 The enumerations order is undefined - i.e. usually NOT sorted by
 filenames (but by creation time - on some systems).
 This excludes entries for '.' or '..'.
-NoOp for non-existing directories; however, this behavior
+OpenError is raised if I represent a non-existant or non-readable directories.
-may be changed in the near future, to raise an exception instead.
 So users of this method better test for existing directory before."
 self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
 eachFileOrDirectory isDirectory ifTrue:[
 aBlock value:eachFileOrDirectory
 "evaluate aBlock for each file in the directory represented by the receiver.
 The block is invoked with a filename-argument.
 The enumerations order is undefined - i.e. usually NOT sorted by
 filenames (but by creation time - on some systems).
 This excludes entries for '.' or '..'.
-NoOp for non-existing directories; however, this behavior
+An OpenError exception is raised it the directory does not exist or is not readable.
-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 enumerates fileName objects; see also
 #directoryContentsDo:, which enumerates strings."
 self directoryContentsDo:[:entry |
 "evaluate aBlock for each file in the directory represented by the receiver.
 The block is invoked with a string as argument.
 The enumerations order is undefined - i.e. usually NOT sorted by
 filenames (but by creation time - on some systems).
 This excludes entries for '.' or '..'.
-An exception is raised it the directory does not exist..
+An OpenError exception is raised it the directory does not exist or is not readable.
 So users of this method better test for existing directory before.
 Notice: this enumerates strings; see also
 #directoryContentsAsFilenamesDo:, which enumerates fileName objects."
-|s fn|
+|s|
-FileStream openErrorSignal
+s := DirectoryStream directoryNamed:self osNameForDirectoryContents.
-handle:[:ex |]
+"check for nil, in order to allow to proceed from an OpenError"
-do:[
+s notNil ifTrue:[
-s := DirectoryStream directoryNamed:(self osNameForDirectoryContents).
+[
+[s atEnd] whileFalse:[
+|fn|
+fn := s nextLine.
+(fn ~= '.' and:[fn ~= '..']) ifTrue:[
+aBlock value:fn
+].
+].
+] ensure:[
+s close.
 ].
-s isNil ifTrue:[^ self].
-[
-[s atEnd] whileFalse:[
-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].
+] on:OpenError do:[:ex| ex proceed]
 "
 "Modified: / 18.9.1997 / 18:42:23 / stefan"
 "Modified: / 23.12.1999 / 20:56:35 / cg"
 !
 files
 "return a collection of files contained in the directory represented by the receiver."
-^ self directoryContentsAsFilenames
+|collection|
-reject:[:eachFileOrDirectory | eachFileOrDirectory isDirectory ]
+collection := OrderedCollection new.
+self directoryContentsAsFilenamesDo:[:eachFileName |
+eachFileName isRegularFile ifTrue:[
+collection add:eachFileName
+].
+].
+^ collection.
 "
 '.' asFilename files.
 "
 !
 filesDo:aBlock
 "evaluate aBlock for all files contained in the directory represented by the receiver."
-^ self directoryContentsAsFilenames
+^ self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
-do:[:eachFileOrDirectory |
+eachFileOrDirectory isRegularFile ifTrue:[ aBlock value: eachFileOrDirectory].
-eachFileOrDirectory isDirectory ifFalse:[ aBlock value: eachFileOrDirectory]].
+].
 "
 '.' asFilename filesDo:[:f | Transcript showCR:f].
 "
 "evaluate aBlock for myself and all (recursive) directories contained in the directory represented by the receiver.
 The block is invoked with a filename-arguments.
 The enumerations order within a directory is undefined - i.e. usually NOT sorted by
 filenames (but by creation time - on some systems).
 This excludes entries for '.' or '..'.
-NoOp for non-existing directories; however, this behavior
+OpenError is raised if the name I represent does not exist or is not readable.
-may be changed in the near future, to raise an exception instead.
 So users of this method better test for existing directory before."
 self isDirectory ifTrue:[
 aBlock value:self.
-self allDirectoriesDo:aBlock
+].
-].
+self allDirectoriesDo:aBlock.
 "
 '.' asFilename withAllDirectoriesDo:[:fn | Transcript showCR:fn name].
+'IdoNOTexist' asFilename withAllDirectoriesDo:[:fn | Transcript showCR:fn name].
+'/etc/hosts' asFilename withAllDirectoriesDo:[:fn | Transcript showCR:fn name].
 "
 ! !
 !Filename methodsFor:'error handling'!
 Raises an error if the file does not exist."
 ^ FileStream readonlyFileNamed:(self osNameForAccess)
 "
-'/tmp/foo' asFilename readStream
+'/tmp/foo' asFilename readStream.
 "
 !
 readWriteStream
 "return a stream for read/write the file represented by the receiver.
 "
 '/etc/foo' asFilename writeStreamOrNil
 "
 ! !
-!Filename methodsFor:'file accessRights'!
+!Filename methodsFor:'file access rights'!
 accessRights
 "return the access rights of the file as opaque data
 (SmallInteger in unix/linux)"
 ^ OperatingSystem createDirectory:(self osNameForDirectory)
 !
 copyTo:newNameArg
-"Copy the files contents into another file.
+"Copy the file's contents into another file.
 The argument must be convertable to a filename.
 Raises an exception, if an error occurs."
 |newName inStream outStream newNameAlreadyExists|
 "Contents is not copied if newName represent same file as me."
 newName asAbsoluteFilename = self asAbsoluteFilename ifTrue: [ ^ self ].
 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.
+].
 [
 newNameAlreadyExists := newName exists.
 outStream := newName writeStream.
 newNameAlreadyExists ifFalse:[
 [
 inStream binary; buffered:false.
 outStream binary; buffered:false.
 inStream copyToEndInto:outStream.
 ] ensure:[
 inStream close.
-outStream notNil ifTrue:[outStream syncData; close].
+outStream notNil ifTrue:[outStream close].
 ].
 "
 'Make.proto' asFilename copyTo:'/tmp/Makefile.foo'
 'Make.proto' asFilename copyTo:'/'
 "Modified: / 10-09-2004 / 09:49:28 / janfrog"
 "Modified: / 29-09-2006 / 16:26:32 / cg"
 !
 copyToStream:outStream
-"Copy the files contents into another file.
+"Copy the file's contents into another file.
 The argument must be convertable to a filename.
 Raises an exception, if an error occurs."
 |inStream resetBinary|
 outStream fileName asAbsoluteFilename = self asAbsoluteFilename ifTrue: [ ^ self ].
 ].
 inStream := self readStream.
 [
-inStream binary; buffered:false.
+inStream binary"; buffered:false".
 resetBinary := false.
 outStream isBinary ifFalse:[
 outStream binary.
 resetBinary := true.
 ].
 writeStream := self newReadWriteStream.
 ].
 writeStream close.
 !
+createAsSymbolicLinkTo:linkFilenameString
+"create a directory with the receivers name.
+Raises an exception if not successful"
+OperatingSystem createSymbolicLinkFrom:linkFilenameString to:self pathName.
+"
+'/tmp/link' asFilename makeSymbolicLinkTo:'bla'
+"
+!
 delete
 "remove the file - same as remove, for ST-80 compatibility"
 self remove
 !
 s close.
 f moveTo:'./foo'
 "
 !
-moveTo:newName
+moveTo:newNameArg
 "copy the file represented by the receiver, then delete it.
 This is different to renaming in case of cross device moves.
 Raise an exception if not successful.
 (Notice, that a rename is tried first, in case of non-cross device move)"
+|newName|
+newName := newNameArg asFilename.
 [self renameTo:newName]
 on:(OSErrorHolder inappropriateReferentSignal)
 do:[:ex |
 "handle renames accross device boundaries (Unix. cross device link)"
 self isDirectory ifTrue:[
 recursiveCopyTo:destination
 "if I represent a regular file, copy it.
 Otherwise, copy the directory and recursively
 all of its subfiles/subdirectories.
-Raises an exception if not successful."
+Raises an exception if not successful.
-|ok d|
+Do not resolve symbolic links.
+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:[
-d := destination asFilename.
+destinationFilename isDirectory ifTrue:[
-d isDirectory ifTrue:[
+destinationFilename := destinationFilename construct:self baseName.
-d := d construct:self baseName.
 ].
-self copyTo:d.
+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:(destination asFilename osNameForDirectory).
+to:(destinationFilename osNameForDirectory).
 ok ifFalse:[
-self recursiveCopyWithoutOSCommandTo:destination
+self recursiveCopyWithoutOSCommandTo:destinationFilename
 ].
+"
+'.' asFilename recursiveCopyTo:'/tmp/xxx'.
+"
 "Created: / 05-05-1999 / 13:35:01 / cg"
 "Modified: / 31-05-1999 / 13:11:34 / cg"
 "Modified: / 29-07-2010 / 12:41:06 / sr"
 !
 recursiveCopyWithoutOSCommandTo:destination
 "if I represent a regular file, copy it.
 Otherwise, copy the directory and all of its subfiles/subdirectories.
 This one walks down the directory hierarchy, not using any OS command to do the copy.
-Raises an exception if not successful."
+Raises an exception if not successful.
+Do not resolve symbolic links.
+If a whole directory is to be copied and the destination directory
+does not exist, it will be created."
 |destinationFilename|
 destinationFilename := destination asFilename.
 self isDirectory ifTrue:[
-destinationFilename exists ifTrue:[
+destinationFilename exists ifFalse:[
-destinationFilename := destinationFilename construct:self baseName.
-destinationFilename makeDirectory.
-] 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:destinationFilename
+src recursiveCopyWithoutOSCommandTo:dst
+] ifFalse:[src isSymbolicLink ifTrue:[
+dst
+remove;
+createAsSymbolicLinkTo:src linkInfo path.
 ] ifFalse:[
-src copyTo:(destinationFilename construct:aFilenameString)
+src copyTo:dst.
-].
+]].
-]
+].
 ] ifFalse:[
-self copyTo:destinationFilename
+destinationFilename isDirectory ifTrue:[
+destinationFilename := destinationFilename construct:self baseName.
+].
+self copyTo:destinationFilename.
 ]
 "
 '.' asFilename recursiveCopyWithoutOSCommandTo:'/tmp/xxx'.
 'smalltalk.rc' asFilename recursiveCopyWithoutOSCommandTo:'/tmp/xxx'.
 'foo' asFilename makeDirectory.
 'foo' asFilename removeFile
 "
 !
-renameTo:newName
+renameTo:newNameArg
 "rename the file - the argument must be convertable to a String.
 Raises an exception if not successful.
 If newName already exists, it will be replaced by myself."
-|errno|
+|errno newName|
+newName := newNameArg asFilename.
 (OperatingSystem
 renameFile:(self osNameForFile)
-to:(newName asFilename osNameForFile)
+to:(newName osNameForFile)
 ) ifFalse:[
 errno := OperatingSystem lastErrorNumber.
 self exists ifFalse:[
 ^ self fileNotFoundError:self
 ].
 (OperatingSystem errorHolderForNumber:errno)
-parameter:newName asFilename;
+parameter:newName;
 reportError.
 ].
 "
 '/tmp/foo' asFilename renameTo:'/tmp/bar'
 "Modified: / 5.5.1999 / 13:41:27 / cg"
 !
 safeCopyTo:newNameArg
-"Copy the files contents into another file.
+"Copy the file's contents into another file.
 Do it safe in an atomic operation shich makes sure that no partially written file appears.
 The argument must be convertable to a filename.
 Raises an exception, if an error occurs."
 |newName inStream accessRights tempStream|
 accessRights := self accessRights.
 ].
 [
 "let the temp filename start with a ~ to make it invisible"
-tempStream := FileStream newTemporaryIn:newName directory nameTemplate:'~%1_%2'.
+tempStream := FileStream newTemporaryIn:newName directory osNameForFile nameTemplate:'~%1_%2'.
 [
-"would be nice to keep the access rights of the original test suite"
+"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"
 ].
 "Modified: / 10-09-2004 / 09:49:28 / janfrog"
 "Modified: / 29-09-2006 / 16:26:32 / cg"
 !
 truncateTo:newSize
-"change the files size.
+"change the file's size.
 This may not be supported on all operating systems
 (raises an exception, if not)"
 (OperatingSystem truncateFile:self osNameForFile to:newSize) ifFalse:[
 ^ self reportError:'unsupported operation' with:self
 ! !
 !Filename methodsFor:'file queries'!
 accessTime
-"return a timeStamp containing the files last access time."
+"return a timeStamp containing the file's last access time."
 | i |
 (i := self info) isNil ifTrue:[^ nil].
 ^ i accessTime
 "Modified: / 26.9.1997 / 13:05:51 / stefan"
 "Modified: / 17.8.1998 / 10:23:44 / cg"
 !
 creationTime
-"return a timeStamp containing the files creation time.
+"return a timeStamp containing the file's creation time.
 NOTICE: only windoof distinguishes creation from modification;
 under unix, nil is returned (callers should fall back and use mod-time then"
 |i|
 "Modified: / 26.9.1997 / 13:05:39 / stefan"
 "Modified: / 14.8.1998 / 17:42:50 / cg"
 !
 dates
-"return the files modification and access times as an object (currently a dictionary)
+"return the file's modification and access times as an object (currently a dictionary)
 that responds to the at: message with arguments
 #modified, #accessed or #statusChanged."
 |info dates osName|
 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."
-|buffer s n suffix idx baseNm info|
+|suffix baseNm info mime|
 "/ since we cannot depend on a 'file' command being available,
 "/ 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)
 ].
 self isReadable ifFalse:[^ 'unreadable'].
 info fileSize == 0 ifTrue:[^ 'empty'].
-suffix := self suffix asLowercase.
+"/ suffix := self suffix asLowercase.
-baseNm := self withoutSuffix baseName asLowercase.
+"/ baseNm := self withoutSuffix baseName asLowercase.
-((#('st' 'rc' 'chg' 'htm' 'html' 'ps' 'cls' 'pac') includes:suffix)
+mime := self mimeTypeOfContents.
-or:[#('makefile') includes:baseNm]) ifTrue:[
+mime notNil ifTrue:[
+"/ kludge to avoid making libview a prereq. of libbasic
-buffer := String new:2048.
+(Smalltalk at:#MIMETypes) notNil ifTrue:[
-s := self readStreamOrNil.
+info := (Smalltalk at:#MIMETypes) fileInfoForMimeType:mime.
-s notNil ifTrue:[
+info notNil ifTrue:[^ info].
-n := s nextBytes:buffer size into:buffer.
+].
-s close.
+].
-buffer := buffer asLowercase.
-(#('st' 'cls') includes:suffix) ifTrue:[
-#(
-('from squeak'        'smalltalk source (Squeak)')
-('from dolphin'       'smalltalk source (Dolphin)')
-('from visualworks'   'smalltalk source (VisualWorks)')
-('categoriesforclass' 'smalltalk source (Dolphin)')
-('methodsfor!!'        'smalltalk source (Dolphin, ST/V or V''age)')
-('subclass:'          'smalltalk source')
-('methodsfor:'        'smalltalk source')
-) pairsDo:[:pattern :what |
-(buffer findString:pattern) ~~ 0 ifTrue:[
-^ what
-]
-].
-].
-(buffer findString:'methodsfor:') ~~ 0 ifTrue:[
-^ 'smalltalk changes / method source'
-].
-(suffix = 'rc') ifTrue:[
-(buffer findString:'st/x startup') ~~ 0 ifTrue:[
-^ 'smalltalk startup script'
-].
-].
-(suffix = 'htm' or:[suffix = 'html']) ifTrue:[
-(idx := buffer findString:'<h') ~~ 0 ifTrue:[
-((buffer continuesWith:'<head' startingAt:idx)
-or:[(buffer continuesWith:'<html' startingAt:idx)
-or:[(buffer continuesWith:'<h1' startingAt:idx)
-or:[(buffer continuesWith:'<h2' startingAt:idx)
-or:[(buffer continuesWith:'<h3' startingAt:idx)
-or:[(buffer continuesWith:'<h4' startingAt:idx)
-or:[(buffer continuesWith:'<h5' startingAt:idx)
-or:[(buffer continuesWith:'<h6' startingAt:idx)]]]]]]])
-ifTrue:[
-^ 'HTML document text'
-]
-].
-].
-(suffix = 'ps') ifTrue:[
-(buffer findString:'%!!ps-adobe') ~~ 0 ifTrue:[
-^ 'PostScript document'
-].
-].
-(baseNm = 'makefile') ifTrue:[
-(buffer startsWith:'#') ifTrue:[
-^ 'make rules'
-]
-]
-]
-].
 ^ 'file'
 "
 'Makefile' asFilename fileType
 '.' asFilename fileType
 "Modified: / 21.7.1998 / 11:25:56 / cg"
 !
 id
-"return the files/directories file-id (inode number)"
+"return the file's/directory's file-id (inode number)"
 ^ OperatingSystem idOf:(self osNameForAccess)
 "
 Filename currentDirectory id
 "Modified: 9.7.1996 / 10:19:27 / cg"
 "Created: 5.8.1997 / 19:26:01 / cg"
 !
 info
-"return some object filled with the files info;
+"return some object filled with the file's info;
 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
 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)
-statusChanged - last staus change (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
 '..\..\..' asFilename info
 '..\..\..\..' asFilename info
 'c:\' asFilename info
 "
-"Modified: / 17.8.1998 / 10:24:10 / cg"
+"Modified: / 17-08-1998 / 10:24:10 / cg"
+"Modified (comment): / 21-03-2014 / 00:35:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 linkInfo
-"return the files info. If it is a symbolic link return the info of the link itself
+"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,
 "Modified: 1.11.1996 / 20:49:09 / cg"
 !
 modificationTime
-"return a timeStamp containing the files modification time."
+"return a timeStamp containing the file's modification time."
 |i|
 (i := self info) isNil ifTrue:[^ nil].      "/ non-existing
 ^ i modificationTime
 OperatingSystem isOSXlike ifFalse:[
 self warn:'sorry - this operation is only available under osx'.
 ].
-OperatingSystem executeCommand:'open ',self pathName
+OperatingSystem executeCommand:'open "',self pathName,'"'
 !
 openTerminal
-"open a terminal window on the directory represented by the receiver.
+"open a terminal window on the directory represented by the receiver;
-On non-osx systems, an error is raised"
+on osx, a terminal app is opened,
+on windows a cmd.exe window,
+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.
+].
 [
+|cmd|
 OperatingSystem isOSXlike ifTrue:[
-OperatingSystem executeCommand:'/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal ' inDirectory:self pathName.
+cmd := '/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal '
 ] ifFalse:[
-OperatingSystem executeCommand:'xterm ' inDirectory:self pathName.
+OperatingSystem isMSWINDOWSlike ifTrue:[
-]
+cmd := 'c:\windows\System32\cmd.exe'
+] ifFalse:[
+"/ VT100TerminalView openShellIn:self pathName
+cmd := 'xterm'
+]
+].
+OperatingSystem
+executeCommand:cmd
+inDirectory:self pathName.
 ] fork
 ! !
 !Filename methodsFor:'printing & storing'!
 isHidden
 "return true, if the receiver represents a hidden file.
 The definitions of hidden files depends on the OS used;
 on UNIX, a name starting with a period is considered hidden;
-on MSDOS, the files hidden attribute is also used.
+on MSDOS, the file's hidden attribute is also used.
 VMS has no concept of hidden files."
 ^ false
 !
 ! !
 !Filename methodsFor:'queries-contents'!
 mimeTypeFromName
-"return the mimeType as guessed from the files name/and or extension.
+"return the mimeType as guessed from the file's name/and or extension.
 This could be less accurate than mimeTypeOfContents, but avoids
 reading the file (is therefore much faster).
 Also it works with non-existing files.
 Returns nil for directories and other non-regular files."
-^ MIMETypes mimeTypeForFilename:(self name)
+|mimeTypes|
+"/ kludge to avoid making libview a prereq. of libbasic
+(mimeTypes := Smalltalk at:#MIMETypes) notNil ifTrue:[
+^ mimeTypes mimeTypeForFilename:(self name)
+].
+^ nil
 "
 'Makefile' asFilename mimeTypeFromName
 '.' asFilename mimeTypeFromName
 '/dev/null' asFilename mimeTypeFromName
 "this tries to guess the mime type of contents of
 the file. Returns nil, if the file is unreadable, not a plain file
 or the contents is unknown.
 This is done using some heuristics, and may need some improvement"
-|type buffer s size|
+|type buffer s size mimeTypes|
 type := self type.
 type isNil ifTrue:[ ^ nil ].
 type == #directory ifTrue:[ ^ nil ].
 type == #characterSpecial ifTrue:[ ^ nil ].
 ] do:[
 size := s nextBytes:buffer size into:buffer.
 ].
 s close.
-^ MIMETypes mimeTypeOfData:buffer
+"/ kludge to avoid making libview a prereq. of libbasic
+(mimeTypes := Smalltalk at:#MIMETypes) notNil ifTrue:[
-"/    lcBuffer := buffer asLowercase.
+^ mimeTypes mimeTypeOfData:buffer suffix:self suffix.
-"/
+].
-"/    (idx := lcBuffer findString:'mimetype:') ~~ 0 ifTrue:[
+^ nil
-"/        idx := idx + 'mimetype:' size.
-"/        idx := lcBuffer indexOfNonSeparatorStartingAt:idx.
-"/        idx2 := lcBuffer indexOfSeparatorStartingAt:idx.
-"/        idx2 > idx ifTrue:[
-"/            ^ lcBuffer copyFrom:idx to:idx2-1
-"/        ].
-"/    ].
-"/
-"/    #(
-"/        ( 'lnk' #[16r4C 16r00 16r00 16r00 16r01 16r14 16r02 16r00 16r00 16r00 16r00 16r00 16rC0 16r00 16r00 16r00 16r00 16r00 16r00 16r46]
-"/                #'application/x-ms-shortcut' )
-"/        ( 'top' 'WALTOP'
-"/                #'application/x-waltop-digital-notepad' )
-"/     ) triplesDo:[:suffixMatch :pattern :what |
-"/        |patternString|
-"/
-"/        (suffixMatch isNil or:[suffixMatch match:self suffix ignoreCase:true]) ifTrue:[
-"/            patternString := pattern asString.
-"/            (buffer startsWith:patternString) ifTrue:[
-"/                ^ what
-"/            ]
-"/        ]
-"/    ].
-"/
-"/    #(
-"/            ('<body:'                   #'text/html')
-"/            ('%!!ps-adobe'               #'application/postscript')
-"/            ('%PDF-'                    #'application/pdf')
-"/            ('#!! /bin/sh'               #'application/x-sh')
-"/            ('#!!/bin/sh'                #'application/x-sh')
-"/            "/ ('#!! /bin/bash'              'application/x-bash')
-"/            "/ ('#!!/bin/bash'               'application/x-bash')
-"/            ('<?xml version='           #'text/xml')
-"/
-"/            ('from dolphin'             #'application/x-smalltalk-source')
-"/            ('from visualworks'         #'application/x-smalltalk-source')
-"/            ('categoriesforclass'       #'application/x-smalltalk-source')
-"/            ('methodsfor!!'              #'application/x-smalltalk-source')
-"/            ('subclass:'                #'application/x-smalltalk-source')
-"/            ('methodsfor:'              #'application/x-smalltalk-source')
-"/            ('interchangeversion:'      #'application/x-smalltalk-source-sif')
-"/            ('subclass:'                #'application/x-smalltalk-source')
-"/            ('methodsfor:'              #'application/x-smalltalk-source')
-"/
-"/     ) pairsDo:[:pattern :what |
-"/        (lcBuffer findString:pattern) ~~ 0 ifTrue:[
-"/            ^ what
-"/        ]
-"/    ].
-"/
-"/    (idx := lcBuffer findString:'<h') ~~ 0 ifTrue:[
-"/        ((lcBuffer continuesWith:'<head' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<html' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h1' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h2' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h3' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h4' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h5' startingAt:idx)
-"/        or:[(lcBuffer continuesWith:'<h6' startingAt:idx)]]]]]]])
-"/        ifTrue:[
-"/            ^ #'text/html'
-"/        ]
-"/    ].
-"/
-"/    [size ~~ 0 and:[(buffer at:size) isPrintable]] whileTrue:[size := size - 1].
-"/
-"/    size == 0 ifTrue:[
-"/        ^ #'text/plain'
-"/    ].
-"/    ^ nil
 "
 'Makefile' asFilename mimeTypeOfContents
 '.' asFilename mimeTypeOfContents
 '/dev/null' asFilename mimeTypeOfContents
 a string instead of a Filename instance).
 See also: #pathName, #directoryPathName and #baseName.
 Compatibility note: use #head for ST-80 compatibility."
-|index sep sepString p rest|
+|index sep sepString p rest parentDirectoryString|
 sep := self separator.
 sepString := sep asString.
 (nameString = sepString) ifTrue:[
 "/
 "/ the trivial '/' case
 "/
-^ nameString
+^ sepString
 ].
 "/
 "/ strip off multiple trailing slashes
 "/
 p := nameString.
-[p endsWith:sepString] whileTrue:[
+[p endsWith:sep] whileTrue:[
 (p = sepString) ifTrue:[
-^ p
+^ sepString
 ].
 p := p copyButLast:1
 ].
+parentDirectoryString := self class parentDirectoryName.
 "/ 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
 ].
 ^ '.'
 ].
 rest := p copyFrom:(index+1).
 (rest = '.') ifTrue:[
 ^ p copyTo:index-1.
 ].
-(rest = '..') ifTrue:[
+(rest = parentDirectoryString) ifTrue:[
 ^ (self species named:(p copyTo:(index-1))) directoryName
 ].
 index == 1 ifTrue:[
-^ '/'
+^ sepString
 ].
 ^ p copyTo:(index - 1)
 "
 '/home' asFilename directoryName
 "/   otherwise, return the longest common prefix of all files.
 self isDirectory ifTrue:[
 |first longest|
 first := nil.
-self directoryContentsDo:[:fileName |
+OpenError catch:[
-((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
+self directoryContentsDo:[:fileName |
-matching add:fileName.
+((fileName ~= '.') and:[fileName ~= parentString]) ifTrue:[
-first isNil ifTrue:[
+matching add:fileName.
-first := longest := fileName.
+first isNil ifTrue:[
-] ifFalse:[
+first := longest := fileName.
-"/ more than one file
+] ifFalse:[
-longest := longest commonPrefixWith:fileName ignoreCase:caseless.
+"/ more than one file
-longest isEmpty ifTrue:[
+longest := longest commonPrefixWith:fileName ignoreCase:caseless.
-^ #()
+longest isEmpty ifTrue:[
-].
+^ #()
+].
+]
 ]
-]
+].
 ].
 longest notNil ifTrue:[
 nameString := (self constructString:longest).
 ^ matching
 ].
 "Created: 18.9.1997 / 18:04:51 / stefan"
 !
 isParentDirectoryOf:aFilenameOrString
-"warning: may lead to automounting"
+"Answer true, if myself is a parent directory of aFilenameOrString.
+Unexpected results may be returned, if one of myself or aFilenameOrString does
-|filenameArg otherName myName|
+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"
+|filenameArg otherNames myNames myName|
 filenameArg := aFilenameOrString asFilename.
-filenameArg isDirectory ifFalse:[
-filenameArg := filenameArg directory.
+"first do a simple comparison"
-].
+otherNames := self class canonicalizedNameComponents:filenameArg name.
+myNames := self class canonicalizedNameComponents:self name.
-otherName := filenameArg name.
+((otherNames startsWith:myNames) and:[myNames first ~= self class parentDirectoryName]) ifTrue:[
-myName := self name.
+^ otherNames ~= myNames
-(otherName startsWith:myName ) ifTrue:[
+].
-^ (otherName ~= myName)
-].
+"fall back - try it again with ~ substitution and symbolic links resolved"
+otherNames := self class canonicalizedNameComponents:filenameArg pathName.
-otherName := filenameArg pathName.
+myNames := self class canonicalizedNameComponents:self pathName.
-myName := self pathName.
+(otherNames startsWith:myNames) ifTrue:[
-(otherName startsWith:myName ) ifTrue:[
+^ otherNames ~= myNames
-^ (otherName ~= myName)
+].
-].
+myName := self class nameFromComponents:myNames.
 filenameArg allParentDirectoriesDo:[:parent |
 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'
 "
 !
 isRelative
 "Modified: 21.12.1996 / 15:29:50 / cg"
 !
 tail
-"the files 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
 "
 prefixAndSuffix
 "return an array consisting of my prefix and suffix.
 The suffix is the namepart after the final period character,
 the prefix everything before, except for the period.
 The directory name part is stripped off (i.e. the returned prefix
-will consist of the files basename only.)
+will consist of the file's basename only.)
 (on some systems, the suffix-character may be different from a period).
 For example, foo.bar.baz has a prefix of 'foo.bar' and a suffix of '.baz'.
 An exception to the above: if the name starts with the suffixCharacter,
 that part is NOT considered a suffix. Thus, '.foorc' has no suffix and a prefix of
 '.foorc'.
 ! !
 !Filename class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.409 2013-12-06 15:30:31 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.434 2015-01-21 19:03:50 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.409 2013-12-06 15:30:31 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.434 2015-01-21 19:03:50 stefan Exp $'
 ! !
 Filename initialize!

branch	jv
changeset 18120	e3a375d5f6a8
parent 18113	92b4242b2b0b
parent 17310	ebac8ce814f7
child 18274	042d13555f1f