--- a/Win32OperatingSystem.st Thu Apr 14 11:21:53 2005 +0200
+++ b/Win32OperatingSystem.st Thu Apr 14 15:07:11 2005 +0200
@@ -2783,7 +2783,7 @@
OperatingSystem canExecuteCommand:'fooBar'
OperatingSystem canExecuteCommand:'ls'
OperatingSystem canExecuteCommand:'cvs'
- OperatingSystem canExecuteCommand:'diff'
+ OperatingSystem canExecuteCommand:'diff'
OperatingSystem canExecuteCommand:'cvs.exe'
OperatingSystem canExecuteCommand:'C:\Dokumente und Einstellungen\penk\work\stx\projects\smalltalk\cvs.exe'
OperatingSystem canExecuteCommand:'C:\Windows\cvs.exe'
@@ -3022,38 +3022,38 @@
|path f fExt|
aCommand asFilename isAbsolute ifTrue:[
- aCommand asFilename exists ifTrue:[
- ^ aCommand
- ].
- ^ nil
+ aCommand asFilename exists ifTrue:[
+ ^ aCommand
+ ].
+ ^ nil
].
path := self getEnvironment:'PATH'.
path notNil ifTrue:[
- (path asCollectionOfSubstringsSeparatedBy:(self pathSeparator)) do:[:path |
- path isEmpty ifTrue:[
- f := aCommand asFilename
- ] ifFalse:[
- f := path asFilename construct:aCommand.
- ].
- self executableFileExtensions do:[:ext |
- ext notEmpty ifTrue:[
- fExt := (f pathName , '.' , ext) asFilename.
- ] ifFalse:[
- fExt := f.
- ].
- fExt isExecutable ifTrue:[
- ^ fExt pathName
- ].
- ].
- ].
+ (path asCollectionOfSubstringsSeparatedBy:(self pathSeparator)) do:[:path |
+ path isEmpty ifTrue:[
+ f := aCommand asFilename
+ ] ifFalse:[
+ f := path asFilename construct:aCommand.
+ ].
+ self executableFileExtensions do:[:ext |
+ ext notEmpty ifTrue:[
+ fExt := (f pathName , '.' , ext) asFilename.
+ ] ifFalse:[
+ fExt := f.
+ ].
+ fExt isExecutable ifTrue:[
+ ^ fExt pathName
+ ].
+ ].
+ ].
].
^ nil
"windows:
OperatingSystem pathOfCommand:'bcc32'
- OperatingSystem pathOfCommand:'diff'
+ OperatingSystem pathOfCommand:'diff'
"
"Modified: / 10.9.1998 / 17:51:49 / cg"
@@ -5762,11 +5762,13 @@
info := Dictionary new.
nAdapters notNil ifTrue:[
1 to:nAdapters do:[:i |
- |entry name macAddr|
+ |entry name description macAddr ipAddr|
entry := rawData at:i.
name := entry at:1.
+ "/ description := entry at:2.
macAddr := entry at:3.
+ "/ ipAddr := entry at:4.
info at:name put:macAddr.
].
].
@@ -9295,7 +9297,7 @@
!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.178 2005-03-29 13:11:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.179 2005-04-14 13:07:11 cg Exp $'
! !
!Win32OperatingSystem::Win32FILEHandle methodsFor:'release'!
@@ -9322,7 +9324,7 @@
!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.178 2005-03-29 13:11:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.179 2005-04-14 13:07:11 cg Exp $'
! !
!Win32OperatingSystem::Win32Handle methodsFor:'io'!
@@ -10342,7 +10344,7 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.178 2005-03-29 13:11:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.179 2005-04-14 13:07:11 cg Exp $'
! !
Win32OperatingSystem initialize!