hg/stx-libbasic: comparison FileDir.st

equal deleted inserted replaced

-:be947d4e7fb2
+:514c749165c3
 FileDirectory comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Attic/FileDir.st,v 1.11 1994-08-05 00:54:45 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/FileDir.st,v 1.12 1994-10-10 00:26:00 claus Exp $
 '!
 !FileDirectory class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libbasic/Attic/FileDir.st,v 1.11 1994-08-05 00:54:45 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/FileDir.st,v 1.12 1994-10-10 00:26:00 claus Exp $
 "
 !
 documentation
 "
 !FileDirectory class methodsFor:'instance creation'!
 rootDirectory
 "create and return a new FileDirectory for the root directory"
-^ (self basicNew) pathName:'/'
+^ (self basicNew) pathName:(OperatingSystem fileSeparator asString)
 "
 FileDirectory rootDirectory contents
 FileDirectory rootDirectory files
 FileDirectory rootDirectory isReadable
 directoryNamed:name in:aFileDirectory
 "create and return a new FileDirectory for the directory with given name
 in another FileDirectory"
-|baseName|
+|baseName sep|
-((name at:1) == $/) ifTrue:[
+sep := OperatingSystem fileSeparator.
+((name at:1) == sep) ifTrue:[
 ^ self directoryNamed:name
 ].
 (aFileDirectory isKindOf:FileDirectory) ifTrue:[
 baseName := aFileDirectory pathName
 ] ifFalse:[
 ^ (self basicNew) pathName:(OperatingSystem directoryNameOf:baseName)
 ].
 "
 (name = '.') ifTrue:[^ aFileDirectory].
-(baseName = '/') ifFalse:[
+(baseName = sep asString) ifFalse:[
-(baseName endsWith:'/') ifFalse:[
+(baseName endsWith:sep) ifFalse:[
-baseName := baseName , '/'
+baseName := baseName copyWith:sep
 ]
 ].
 ^ (self basicNew) pathName:(baseName , name)
 ! !
 pathName:dirName
 "set my pathname; return nil if not a valid path; self otherwise"
 pathName := dirName.
-(dirName startsWith:'/') ifFalse:[
+(dirName startsWith:OperatingSystem fileSeparator) ifFalse:[
 lazy := true
 ] ifTrue:[
 (dirName includes:$.) ifTrue:[
 lazy := true
 ]
 getFullPathName
 "make my pathname be a full pathname - i.e. starting at root"
 |aStream command shortPathName fullPathName|
-(pathName = '/') ifTrue:[
+(pathName = OperatingSystem fileSeparator asString) ifTrue:[
 lazy := false.
 ^ self
 ].
 "since currentDirectory is used very often, cache its path here"
 |realName|
 (newName = '.') ifFalse:[
 (newName = '..') ifFalse:[
-((newName at:1) == $/) ifTrue:[
+((newName at:1) == OperatingSystem fileSeparator) ifTrue:[
 realName := newName copyFrom:2
 ] ifFalse:[
 realName := newName
 ].
-(realName startsWith:'/') ifTrue:[
+	    ^ OperatingSystem createDirectory:(self class fullPathNameOf:realName in:pathName)
-^ OperatingSystem createDirectory:realName
-] ifFalse:[
-^ OperatingSystem createDirectory:(pathName , '/' , realName)
-]
 ]
 ].
 ^ false
 !
 removeFile:fileName
 "remove the file 'fileName' from myself; return true if successful"
-(fileName startsWith:'/') ifTrue:[
+^ OperatingSystem removeFile:(self class fullPathNameOf:fileName in:pathName).
-^ OperatingSystem removeFile:fileName
-].
-^ OperatingSystem removeFile:(pathName , '/' , fileName)
 !
 removeDirectory:dirName
 "remove the directory 'dirName' from myself; return true if successful.
 If the directory is not empty, the containing files/directories are also
 removed."
-|absPath|
+|path|
-(dirName startsWith:'/') ifTrue:[
+path := self class fullPathNameOf:dirName in:pathName.
-absPath := dirName
+(OperatingSystem removeDirectory:path) ifTrue:[^ true].
-] ifFalse:[
+^ OperatingSystem recursiveRemoveDirectory:path
-absPath := pathName , '/' , dirName
-].
-(OperatingSystem removeDirectory:absPath) ifTrue:[^ true].
-^ OperatingSystem recursiveRemoveDirectory:absPath
 !
 remove:aFileOrDirectoryName
 "remove the file or directory from myself; return true if successful"
 |path|
-(aFileOrDirectoryName startsWith:'/') ifTrue:[
+path := self class fullPathNameOf:aFileOrDirectoryName in:pathName.
-path := aFileOrDirectoryName
-] ifFalse:[
-path := (pathName , '/' , aFileOrDirectoryName)
-].
 (OperatingSystem isDirectory:path) ifTrue:[
 ^ OperatingSystem removeDirectory:path
 ].
 ^ OperatingSystem removeFile:path
 !
 link:oldFileName to:newFileName
 "link oldFileName to newFileName in myself, return true if successful"
 |path1 path2|
-(oldFileName startsWith:'/') ifTrue:[
+path1 := self class fullPathNameOf:oldFileName in:pathName.
-path1 := oldFileName
+path2 := self class fullPathNameOf:newFileName in:pathName.
-] ifFalse:[
-path1 := (pathName , '/' , oldFileName)
-].
-(newFileName startsWith:'/') ifTrue:[
-path2 := newFileName
-] ifFalse:[
-path2 := (pathName , '/' , newFileName)
-].
 ^ OperatingSystem linkFile:path1 to:path2
 !
 renameFile:oldFileName newName:newFileName
 "rename the file; return true if successful"
 |path1 path2|
-(oldFileName startsWith:'/') ifTrue:[
+path1 := self class fullPathNameOf:oldFileName in:pathName.
-path1 := oldFileName
+path2 := self class fullPathNameOf:newFileName in:pathName.
-] ifFalse:[
-path1 := (pathName , '/' , oldFileName)
-].
-(newFileName startsWith:'/') ifTrue:[
-path2 := newFileName
-] ifFalse:[
-path2 := (pathName , '/' , newFileName)
-].
 ^ OperatingSystem renameFile:path1 to:path2
+! !
+!FileDirectory class methodsFor:'private'!
+fullPathNameOf:name in:path
+(name startsWith:OperatingSystem fileSeparator) ifTrue:[
+^ name
+].
+^ path , OperatingSystem fileSeparator asString , name
 ! !
 !FileDirectory methodsFor:'queries'!
 id
 exists
 "return true if this directory exists"
 ^ OperatingSystem isDirectory:pathName
-"(FileDirectory directoryNamed:'fooBar') exists"
+"
+(FileDirectory directoryNamed:'fooBar') exists
+(FileDirectory directoryNamed:'/tmp') exists
+"
 !
 isEmpty
 "return true, if the directory is empty;
 redefined since '.' and '..' do not count as entries here."
 infoOf:name
 "return an array filled with file info for the file 'aFileName';
 return nil if such a file does not exist"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem infoOf:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem infoOf:name
-].
-^ OperatingSystem infoOf:(pathName , '/' , name)
 !
 timeOfLastChange:name
 "return the timeStamp of a file in myself"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem timeOfLastChange:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem timeOfLastChange:name
-].
-^ OperatingSystem timeOfLastChange:(pathName , '/' , name)
 !
 timeOfLastChange
 "return the timeStamp of myself"
 ^ OperatingSystem timeOfLastChange:pathName
 !
-accessModeOf:aFileName
+accessModeOf:name
 "return the access-mode bits (rwxrwxrwx) of a file in myself"
-(aFileName startsWith:'/') ifTrue:[
+^ OperatingSystem accessModeOf:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem accessModeOf:aFileName
+!
-].
-^ OperatingSystem accessModeOf:(pathName , '/' , aFileName)
+changeAccessModeOf:name to:modeBits
-!
-changeAccessModeOf:aFileName to:modeBits
 "set the access-mode bits (rwxrwxrwx) of a file in myself"
-(aFileName startsWith:'/') ifTrue:[
+^ OperatingSystem changeAccessModeOf:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem changeAccessModeOf:aFileName
-to:modeBits
-].
-^ OperatingSystem changeAccessModeOf:(pathName , '/' , aFileName)
 to:modeBits
 !
-typeOf:aFileName
+typeOf:name
 "return the symbolic type of a file in myself"
-(aFileName startsWith:'/') ifTrue:[
+^ OperatingSystem typeOf:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem typeOf:aFileName
-].
-^ OperatingSystem typeOf:(pathName , '/' , aFileName)
 !
 exists:name
 "return true, if the given name exists in myself"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem isValidPath:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem isValidPath:name
-].
-^ OperatingSystem isValidPath:(pathName , '/' , name)
 !
 isDirectory:name
 "return true, if the given name is that of a directory in myself"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem isDirectory:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem isDirectory:name
-].
-^ OperatingSystem isDirectory:(pathName , '/' , name)
 !
 isReadable:name
 "return true, if the given file is readable"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem isReadable:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem isReadable:name
-].
-^ OperatingSystem isReadable:(pathName , '/' , name)
 !
 isWritable:name
 "return true, if the given file is readable"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem isWritable:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem isWritable:name
-].
-^ OperatingSystem isWritable:(pathName , '/' , name)
 !
 isExecutable:name
 "return true, if the given file is executable"
-(name startsWith:'/') ifTrue:[
+^ OperatingSystem isExecutable:(self class fullPathNameOf:name in:pathName)
-^ OperatingSystem isExecutable:name
-].
-^ OperatingSystem isExecutable:(pathName , '/' , name)
 ! !
 !FileDirectory methodsFor:'printing & storing'!
 printString

changeset 159	514c749165c3
parent 92	0c73b48551ac
child 172	52750f9c44de