hg/stx-libbasic: comparison AbstractOperatingSystem.st

equal deleted inserted replaced

-:680d6de80808
+:433983048ce8
 ^ UnsupportedOperationSignal raise
 !
 getCommandOutputFrom:aCommand
 "execute a simple command (such as hostname) and
-return the commands first line of output as a string.
+return the commands first line of output as a string (forget stdErr).
 If the command generates multiple output lines, only the first line is returned.
 If the commands does not generate any output, an empty string is returned;
 if the command fails, nil is returned."
 |result|
-result := self getCommandOutputFrom:aCommand maxNumberOfLines:1.
+result := self getCommandOutputFrom:aCommand maxNumberOfLines:1 errorDisposition:#discard.
 result notNil ifTrue:[
 ^ result firstIfEmpty:['']
 ].
 ^ result
 OperatingSystem getCommandOutputFrom:'foo'
 "
 !
-getCommandOutputFrom:aCommand maxNumberOfLines:numLinesOrNil
+getCommandOutputFrom:aCommand maxNumberOfLines:numLinesOrNil errorDisposition:errorDisposition
 "execute a simple command (such as hostname) and
 return the commands output as a collection of strings,
 but only up to the given number of lines (if non-nil).
 If the command generates more output, only the first nLines are returned
 (but the command is allowed to finish execution).
 If the commands does not generate any output, an empty string is returned;
-if the command fails, nil is returned."
+if the command fails, nil is returned.
+errorDisposition controls where the stdErr output should go,
+and may be one of #discard, #inline or #stderr (default).
+#discard causes stderr to be discarded (/dev/null),
+#inline causes it to be written to smalltalks own stdout and
+#stderr causes it to be written to smalltalks own stderr.
+Nil is treated like #stderr"
 |result|
 PipeFailed ~~ true ifTrue:[
 PipeStream openErrorSignal handle:[:ex |
 ] do:[
 |p line|
 p := PipeStream
 readingFrom:aCommand
-errorDisposition:#discard
+errorDisposition:errorDisposition
 inDirectory:nil.
 p notNil ifTrue:[
 result := StringCollection new.
 [p atEnd] whileFalse:[
 line := p nextLine.
 "Modified: / 19.5.1999 / 14:25:02 / cg"
 !
 getFullCommandOutputFrom:aCommand
-"execute a simple command (such as hostname) and
+"execute a command and
-return the commands output as a collection of strings.
+return the commands output as a collection of strings (including stdErr).
 If the commands does not generate any output, an empty string is returned;
 if the command fails, nil is returned."
-^ self getCommandOutputFrom:aCommand maxNumberOfLines:nil
+^ self getCommandOutputFrom:aCommand maxNumberOfLines:nil errorDisposition:#inline
 "
 OperatingSystem getFullCommandOutputFrom:'mt status'
 "
 ! !
 !AbstractOperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.41 2000-07-25 10:47:43 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.42 2000-07-25 14:15:27 cg Exp $'
 ! !
 AbstractOperatingSystem initialize!

changeset 5482	433983048ce8
parent 5480	92eb8594f437
child 5483	1d81b1ad42d0