--- a/UnixOperatingSystem.st Tue Feb 26 12:40:42 2002 +0100
+++ b/UnixOperatingSystem.st Tue Feb 26 14:02:26 2002 +0100
@@ -4781,8 +4781,8 @@
The amountof information returned depends upon the OS, and is
not guaranteed to be consistent across architectures.
On unix, the information returned is (at least):
- freeBytes
- totalBytes
+ freeBytes
+ totalBytes
"
|p outputText keys values n info
@@ -4792,9 +4792,9 @@
p isNil ifTrue:[^ nil].
[
- outputText := p contentsOfEntireFile.
- ] valueNowOrOnUnwindDo:[
- p close.
+ outputText := p contentsOfEntireFile.
+ ] ensure:[
+ p close.
].
"/ Transcript showCR:outputText asString.
outputText isNil ifTrue:[^ nil].
@@ -4821,22 +4821,22 @@
n := Integer readFrom:(values at:capacityIdx) onError:nil.
n notNil ifTrue:[
- info at:#percentUsed put:n
+ info at:#percentUsed put:n
].
n := Integer readFrom:(values at:availIdx) onError:nil.
n notNil ifTrue:[
- info at:#freeBytes put:(n * 1024)
+ info at:#freeBytes put:(n * 1024)
].
n := Integer readFrom:(values at:usedIdx) onError:nil.
n notNil ifTrue:[
- info at:#usedBytes put:(n * 1024)
+ info at:#usedBytes put:(n * 1024)
].
n := Integer readFrom:(values at:sizeIdx) onError:nil.
n notNil ifTrue:[
- info at:#totalBytes put:(n * 1024)
+ info at:#totalBytes put:(n * 1024)
].
info at:#mountPoint put:(values at:mountIdx).
@@ -4876,8 +4876,8 @@
The amount of information returned depends upon the OS, and is
not guaranteed to be consistent across architectures.
On unix, the information returned is (at least):
- mountPoint - mount point
- fileSystem - device or NFS-remotePath
+ mountPoint - mount point
+ fileSystem - device or NFS-remotePath
"
|p outputText keys values info infoEntry|
@@ -4886,9 +4886,9 @@
p isNil ifTrue:[^ nil].
[
- outputText := p contentsOfEntireFile.
- ] valueNowOrOnUnwindDo:[
- p close.
+ outputText := p contentsOfEntireFile.
+ ] ensure:[
+ p close.
].
"/ Transcript showCR:outputText asString.
outputText isNil ifTrue:[^ nil].
@@ -4903,15 +4903,15 @@
info := OrderedCollection new.
outputText from:2 do:[:line |
- values := line asCollectionOfWords.
-
- values size >= 2 ifTrue:[
-
- infoEntry := IdentityDictionary new.
- infoEntry at:#mountPoint put:(values last).
- infoEntry at:#fileSystem put:(values first).
- info add:infoEntry.
- ]
+ values := line asCollectionOfWords.
+
+ values size >= 2 ifTrue:[
+
+ infoEntry := IdentityDictionary new.
+ infoEntry at:#mountPoint put:(values last).
+ infoEntry at:#fileSystem put:(values first).
+ info add:infoEntry.
+ ]
].
^ info
@@ -10399,7 +10399,7 @@
!UnixOperatingSystem::FilePointerHandle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.115 2002-02-04 10:34:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.116 2002-02-26 12:59:35 cg Exp $'
! !
!UnixOperatingSystem::FilePointerHandle methodsFor:'release'!
@@ -12019,6 +12019,6 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.115 2002-02-04 10:34:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.116 2002-02-26 12:59:35 cg Exp $'
! !
UnixOperatingSystem initialize!