--- a/UnixOperatingSystem.st Wed Oct 12 07:05:13 2016 +0200
+++ b/UnixOperatingSystem.st Tue Oct 25 12:31:42 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1988 by Claus Gittinger
All Rights Reserved
@@ -5118,15 +5116,15 @@
!
getObjectFileInfoFor:aStringOrFilename
- "Return and info object for given executable or shared object
+ "Return an info object for a given executable or shared object
or throw an error if given file is not a valid an executable now
shared object.
The info object returned is OS-specific, however it responds to at
least
- #isFor32BitArchitecture
- #isFor64BitArchitecture ... returns true, if the given object is for
- 32bit, 64bit architecture respectively
+ #isFor32BitArchitecture
+ #isFor64BitArchitecture ... returns true, if the given object is for
+ 32bit, 64bit architecture respectively
"
^ ELFFileHeader fromFile: aStringOrFilename
@@ -9652,30 +9650,32 @@
decodePathOrCommandOutput:encodedPathNameOrOutputLine
"decode the encodedPathNameOrOutputLine as returned by system calls or output by system commands.
+ This takes care for any specific OS encodings or specific command encodings.
+
E.g. linux system calls return single byte strings only,
so pathNames and command output comes UTF-8 encoded.
(actually, on a mac, it comes utf8-mac encoded)."
Codeset notNil ifTrue:[
- encodedPathNameOrOutputLine notNil ifTrue:[
- [
- "/ cg: I am not sure, why this shortcut.
- "/ calling the decoder directly should be much faster
- Codeset == #utf8 ifTrue:[
- ^ encodedPathNameOrOutputLine utf8Decoded.
- ].
- "/ Codeset encoder might not yet be initialized, sigh...
- CodesetEncoder isNil ifTrue:[
- self getCodesetEncoder
- ].
- CodesetEncoder notNil ifTrue:[
- ^ CodesetEncoder decodeString: encodedPathNameOrOutputLine
- ].
- ] on:DecodingError do:[:ex|
- "maybe there are old filenames in ISO-8859-x,
- just keep them untranslated"
- ].
- ].
+ encodedPathNameOrOutputLine notNil ifTrue:[
+ [
+ "/ cg: I am not sure, why this shortcut.
+ "/ calling the decoder directly should be much faster
+ Codeset == #utf8 ifTrue:[
+ ^ encodedPathNameOrOutputLine utf8Decoded.
+ ].
+ "/ Codeset encoder might not yet be initialized, sigh...
+ CodesetEncoder isNil ifTrue:[
+ self getCodesetEncoder
+ ].
+ CodesetEncoder notNil ifTrue:[
+ ^ CodesetEncoder decodeString: encodedPathNameOrOutputLine
+ ].
+ ] on:DecodingError do:[:ex|
+ "maybe there are old filenames in ISO-8859-x,
+ just keep them untranslated"
+ ].
+ ].
].
^ encodedPathNameOrOutputLine
@@ -9801,7 +9801,7 @@
Codeset := #'utf8-mac'.
CodesetEncoder := nil.
OperatingSystem getCodesetEncoder
- OperatingSystem encodePath:'äöü'
+ OperatingSystem encodePath:''
"
"Modified: / 23-01-2013 / 10:00:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -13322,11 +13322,11 @@
self getAddressInfo:'www.exept.de' serviceName:nil
<<<<<<< UnixOperatingSystem.st
domain:#'AF_INET6' type:nil protocol:nil flags:nil
- self getAddressInfo:'www.baden-württemberg.de' serviceName:nil
+ self getAddressInfo:'www.baden-württemberg.de' serviceName:nil
domain:#'AF_INET' type:#stream protocol:nil flags:nil
=======
domain:#'AF_INET6' type:nil protocol:nil flags:nil
- self getAddressInfo:'www.baden-württemberg.de' serviceName:nil
+ self getAddressInfo:'www.baden-wrttemberg.de' serviceName:nil
domain:#'AF_INET' type:#stream protocol:nil flags:nil
>>>>>>> 1.489
"