--- a/PipeStream.st Fri Nov 07 01:02:36 2014 +0100
+++ b/PipeStream.st Fri Nov 07 12:42:18 2014 +0100
@@ -61,7 +61,7 @@
/*
* some systems (i.e. ultrix) use fork;
- * were better off with a popen based on vfork ...
+ * we're better off with a popen based on vfork ...
*/
#ifdef NEED_POPEN_WITH_VFORK
@@ -428,9 +428,9 @@
p isNil ifTrue:[^ nil].
[
- cmdOutput := p contentsAsString.
+ cmdOutput := p contentsAsString.
] ensure:[
- p close.
+ p close.
].
^ cmdOutput
@@ -511,16 +511,16 @@
Use shutDown for a fast (nonBlocking) close."
handle notNil ifTrue:[
- super closeFile.
+ super closeFile.
"/ OperatingSystem isMSDOSlike ifTrue:[
"/ self terminatePipeCommand.
"/ ].
- handle := nil.
- pid notNil ifTrue:[
- "/ wait for the pipe-command to terminate.
- self waitForPipeCommandWithTimeout:nil.
- ].
+ handle := nil.
+ pid notNil ifTrue:[
+ "/ wait for the pipe-command to terminate.
+ self waitForPipeCommandWithTimeout:nil.
+ ].
].
"Modified: / 12.9.1998 / 16:51:04 / cg"
@@ -795,8 +795,8 @@
|tpid|
(tpid := pid) notNil ifTrue:[
- OperatingSystem terminateProcessGroup:tpid.
- OperatingSystem terminateProcess:tpid.
+ OperatingSystem terminateProcessGroup:tpid.
+ OperatingSystem terminateProcess:tpid.
].
!
@@ -817,11 +817,11 @@
!PipeStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/PipeStream.st,v 1.116 2014-06-14 09:22:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/PipeStream.st,v 1.117 2014-11-07 11:42:18 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/PipeStream.st,v 1.116 2014-06-14 09:22:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/PipeStream.st,v 1.117 2014-11-07 11:42:18 cg Exp $'
! !