|
@@ -9,19 +9,24 @@ import (
|
|
|
)
|
|
|
|
|
|
const (
|
|
|
- StdWriterPrefixLen = 8
|
|
|
- StdWriterFdIndex = 0
|
|
|
- StdWriterSizeIndex = 4
|
|
|
+ stdWriterPrefixLen = 8
|
|
|
+ stdWriterFdIndex = 0
|
|
|
+ stdWriterSizeIndex = 4
|
|
|
)
|
|
|
|
|
|
-type StdType [StdWriterPrefixLen]byte
|
|
|
+// StdType prefixes type and length to standard stream.
|
|
|
+type StdType [stdWriterPrefixLen]byte
|
|
|
|
|
|
var (
|
|
|
- Stdin StdType = StdType{0: 0}
|
|
|
- Stdout StdType = StdType{0: 1}
|
|
|
- Stderr StdType = StdType{0: 2}
|
|
|
+ // Stdin represents standard input stream type.
|
|
|
+ Stdin = StdType{0: 0}
|
|
|
+ // Stdout represents standard output stream type.
|
|
|
+ Stdout = StdType{0: 1}
|
|
|
+ // Stderr represents standard error steam type.
|
|
|
+ Stderr = StdType{0: 2}
|
|
|
)
|
|
|
|
|
|
+// StdWriter is wrapper of io.Writer with extra customized info.
|
|
|
type StdWriter struct {
|
|
|
io.Writer
|
|
|
prefix StdType
|
|
@@ -36,10 +41,10 @@ func (w *StdWriter) Write(buf []byte) (n int, err error) {
|
|
|
binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
|
|
|
n1, err = w.Writer.Write(w.prefix[:])
|
|
|
if err != nil {
|
|
|
- n = n1 - StdWriterPrefixLen
|
|
|
+ n = n1 - stdWriterPrefixLen
|
|
|
} else {
|
|
|
n2, err = w.Writer.Write(buf)
|
|
|
- n = n1 + n2 - StdWriterPrefixLen
|
|
|
+ n = n1 + n2 - stdWriterPrefixLen
|
|
|
}
|
|
|
if n < 0 {
|
|
|
n = 0
|
|
@@ -61,7 +66,7 @@ func NewStdWriter(w io.Writer, t StdType) *StdWriter {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-var ErrInvalidStdHeader = errors.New("Unrecognized input header")
|
|
|
+var errInvalidStdHeader = errors.New("Unrecognized input header")
|
|
|
|
|
|
// StdCopy is a modified version of io.Copy.
|
|
|
//
|
|
@@ -75,7 +80,7 @@ var ErrInvalidStdHeader = errors.New("Unrecognized input header")
|
|
|
// `written` will hold the total number of bytes written to `dstout` and `dsterr`.
|
|
|
func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
|
|
|
var (
|
|
|
- buf = make([]byte, 32*1024+StdWriterPrefixLen+1)
|
|
|
+ buf = make([]byte, 32*1024+stdWriterPrefixLen+1)
|
|
|
bufLen = len(buf)
|
|
|
nr, nw int
|
|
|
er, ew error
|
|
@@ -85,12 +90,12 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
|
|
|
|
|
|
for {
|
|
|
// Make sure we have at least a full header
|
|
|
- for nr < StdWriterPrefixLen {
|
|
|
+ for nr < stdWriterPrefixLen {
|
|
|
var nr2 int
|
|
|
nr2, er = src.Read(buf[nr:])
|
|
|
nr += nr2
|
|
|
if er == io.EOF {
|
|
|
- if nr < StdWriterPrefixLen {
|
|
|
+ if nr < stdWriterPrefixLen {
|
|
|
logrus.Debugf("Corrupted prefix: %v", buf[:nr])
|
|
|
return written, nil
|
|
|
}
|
|
@@ -103,7 +108,7 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
|
|
|
}
|
|
|
|
|
|
// Check the first byte to know where to write
|
|
|
- switch buf[StdWriterFdIndex] {
|
|
|
+ switch buf[stdWriterFdIndex] {
|
|
|
case 0:
|
|
|
fallthrough
|
|
|
case 1:
|
|
@@ -113,30 +118,30 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
|
|
|
// Write on stderr
|
|
|
out = dsterr
|
|
|
default:
|
|
|
- logrus.Debugf("Error selecting output fd: (%d)", buf[StdWriterFdIndex])
|
|
|
- return 0, ErrInvalidStdHeader
|
|
|
+ logrus.Debugf("Error selecting output fd: (%d)", buf[stdWriterFdIndex])
|
|
|
+ return 0, errInvalidStdHeader
|
|
|
}
|
|
|
|
|
|
// Retrieve the size of the frame
|
|
|
- frameSize = int(binary.BigEndian.Uint32(buf[StdWriterSizeIndex : StdWriterSizeIndex+4]))
|
|
|
+ frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
|
|
|
logrus.Debugf("framesize: %d", frameSize)
|
|
|
|
|
|
// Check if the buffer is big enough to read the frame.
|
|
|
// Extend it if necessary.
|
|
|
- if frameSize+StdWriterPrefixLen > bufLen {
|
|
|
- logrus.Debugf("Extending buffer cap by %d (was %d)", frameSize+StdWriterPrefixLen-bufLen+1, len(buf))
|
|
|
- buf = append(buf, make([]byte, frameSize+StdWriterPrefixLen-bufLen+1)...)
|
|
|
+ if frameSize+stdWriterPrefixLen > bufLen {
|
|
|
+ logrus.Debugf("Extending buffer cap by %d (was %d)", frameSize+stdWriterPrefixLen-bufLen+1, len(buf))
|
|
|
+ buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-bufLen+1)...)
|
|
|
bufLen = len(buf)
|
|
|
}
|
|
|
|
|
|
// While the amount of bytes read is less than the size of the frame + header, we keep reading
|
|
|
- for nr < frameSize+StdWriterPrefixLen {
|
|
|
+ for nr < frameSize+stdWriterPrefixLen {
|
|
|
var nr2 int
|
|
|
nr2, er = src.Read(buf[nr:])
|
|
|
nr += nr2
|
|
|
if er == io.EOF {
|
|
|
- if nr < frameSize+StdWriterPrefixLen {
|
|
|
- logrus.Debugf("Corrupted frame: %v", buf[StdWriterPrefixLen:nr])
|
|
|
+ if nr < frameSize+stdWriterPrefixLen {
|
|
|
+ logrus.Debugf("Corrupted frame: %v", buf[stdWriterPrefixLen:nr])
|
|
|
return written, nil
|
|
|
}
|
|
|
break
|
|
@@ -148,7 +153,7 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
|
|
|
}
|
|
|
|
|
|
// Write the retrieved frame (without header)
|
|
|
- nw, ew = out.Write(buf[StdWriterPrefixLen : frameSize+StdWriterPrefixLen])
|
|
|
+ nw, ew = out.Write(buf[stdWriterPrefixLen : frameSize+stdWriterPrefixLen])
|
|
|
if ew != nil {
|
|
|
logrus.Debugf("Error writing frame: %s", ew)
|
|
|
return 0, ew
|
|
@@ -161,8 +166,8 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error)
|
|
|
written += int64(nw)
|
|
|
|
|
|
// Move the rest of the buffer to the beginning
|
|
|
- copy(buf, buf[frameSize+StdWriterPrefixLen:])
|
|
|
+ copy(buf, buf[frameSize+stdWriterPrefixLen:])
|
|
|
// Move the index
|
|
|
- nr -= frameSize + StdWriterPrefixLen
|
|
|
+ nr -= frameSize + stdWriterPrefixLen
|
|
|
}
|
|
|
}
|