--- a/ExternalStream.st Tue Feb 10 18:27:36 2015 +0100
+++ b/ExternalStream.st Tue Feb 10 21:51:48 2015 +0100
@@ -2054,7 +2054,15 @@
anyOther -> like #nl
"
- eolMode := aSymbolOrNil
+ aSymbolOrNil == #crnl ifTrue:[
+ eolMode := #crlf
+ ] ifFalse:[
+ aSymbolOrNil == #lf ifTrue:[
+ eolMode := #nl
+ ] ifFalse:[
+ eolMode := aSymbolOrNil
+ ]
+ ].
!
fileDescriptor
@@ -5958,7 +5966,7 @@
&& ((mode == @symbol(cr))
|| (mode == @symbol(etx))
|| (mode == @symbol(eot))
- || (mode == @symbol(crnl)))
+ || (mode == @symbol(crlf)))
&& memchr(stringP, '\n', len) != NULL)
{
// there is a '\n' to be translated, replace it into a buffer
@@ -6139,7 +6147,7 @@
&& ((mode == @symbol(cr))
|| (mode == @symbol(etx))
|| (mode == @symbol(eot))
- || (mode == @symbol(crnl)))
+ || (mode == @symbol(crlf)))
&& memchr(stringP, '\n', len) != NULL)
{
// see if there is a \n which needs to be translated, replace it
@@ -6419,11 +6427,11 @@
!ExternalStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.405 2015-02-07 12:57:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.406 2015-02-10 20:51:48 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.405 2015-02-07 12:57:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.406 2015-02-10 20:51:48 cg Exp $'
! !