cleanup, fix compilation

This commit is contained in:
Mark Harrah 2012-02-19 22:41:26 -05:00
parent a3c745a4e6
commit c40055cc1c
2 changed files with 5 additions and 7 deletions

View File

@ -185,7 +185,7 @@ object TaskExtra extends TaskExtra
def processIO(s: TaskStreams[_]): ProcessIO =
{
def transfer(id: String) = (in: InputStream) => BasicIO.transferFully(in, s.binary(id))
new ProcessIO(BasicIO.ignoreOut, transfer(s.outID), transfer(s.errorID))
new ProcessIO(BasicIO.closeOut, transfer(s.outID), transfer(s.errorID))
}
def reduced[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] =
i match

View File

@ -51,6 +51,7 @@ object BasicIO
private def processErrFully(log: ProcessLogger) = processFully(s => log.error(s))
private def processInfoFully(log: ProcessLogger) = processFully(s => log.info(s))
def closeOut = (_: OutputStream).close()
final val BufferSize = 8192
final val Newline = System.getProperty("line.separator")
@ -61,7 +62,7 @@ object BasicIO
{
val reader = new BufferedReader(new InputStreamReader(in))
processLinesFully(processLine)(reader.readLine)
reader.close()
reader.close()
}
def processLinesFully(processLine: String => Unit)(readLine: () => String)
{
@ -77,10 +78,7 @@ object BasicIO
readFully()
}
def connectToIn(o: OutputStream) { transferFully(Uncloseable protect System.in, o) }
def input(connect: Boolean): OutputStream => Unit = { outputToProcess =>
if(connect) connectToIn(outputToProcess)
else outputToProcess.close()
}
def input(connect: Boolean): OutputStream => Unit = if(connect) connectToIn else closeOut
def standard(connectInput: Boolean): ProcessIO = standard(input(connectInput))
def standard(in: OutputStream => Unit): ProcessIO = new ProcessIO(in, toStdOut, toStdErr)
@ -113,7 +111,7 @@ object BasicIO
}
}
read
in.close()
in.close()
}
}