From d06e97b37db762847c34dc3f7dfdd212088084ca Mon Sep 17 00:00:00 2001
From: Brett Randall <javabrett@gmail.com>
Date: Fri, 29 Apr 2016 07:12:33 +1000
Subject: [PATCH] Removed Go 1.6-specific API changes introduced in the
 previous commit.  This commit can be reverted as soon as Go >= 1.6 is
 required.

This commit copies-down some utility methods introduced as part of the API change in Go 1.6.  These changes are convenient to use here, since they auto-truncate stderr error output.

Revert this commit when moving to Go 1.6.
---
 subprocess/subprocess.go | 96 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/subprocess/subprocess.go b/subprocess/subprocess.go
index 1f1e508a..00ffe3c7 100644
--- a/subprocess/subprocess.go
+++ b/subprocess/subprocess.go
@@ -3,9 +3,11 @@
 package subprocess
 
 import (
+	"bytes"
 	"fmt"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 
 	"github.com/rubyist/tracerx"
@@ -16,9 +18,18 @@ func SimpleExec(name string, args ...string) (string, error) {
 	tracerx.Printf("run_command: '%s' %s", name, strings.Join(args, " "))
 	cmd := ExecCommand(name, args...)
 
+	//start copied from Go 1.6 exec.go
+	captureErr := cmd.Stderr == nil
+	if captureErr {
+		cmd.Stderr = &prefixSuffixSaver{N: 32 << 10}
+	}
+	//end copied from Go 1.6 exec.go
+
 	output, err := cmd.Output()
+
 	if exitError, ok := err.(*exec.ExitError); ok {
-		errorOutput := strings.TrimSpace(string(exitError.Stderr))
+		// TODO for min Go 1.6+, replace with ExitError.Stderr
+		errorOutput := strings.TrimSpace(string(cmd.Stderr.(*prefixSuffixSaver).Bytes()))
 		if errorOutput == "" {
 			// some commands might write nothing to stderr but something to stdout in error-conditions, in which case, we'll use that
 			// in the error string
@@ -48,3 +59,86 @@ func init() {
 		env = append(env, kv)
 	}
 }
+
+// remaining code in file copied from Go 1.6 (c4fa25f4fc8f4419d0b0707bcdae9199a745face) exec.go and can be removed if moving to Go 1.6 minimum.
+// go 1.6 adds ExitError.Stderr with nice prefix/suffix trimming, which could replace cmd.Stderr above
+
+//start copied from Go 1.6 exec.go
+// prefixSuffixSaver is an io.Writer which retains the first N bytes
+// and the last N bytes written to it. The Bytes() methods reconstructs
+// it with a pretty error message.
+type prefixSuffixSaver struct {
+	N         int // max size of prefix or suffix
+	prefix    []byte
+	suffix    []byte // ring buffer once len(suffix) == N
+	suffixOff int    // offset to write into suffix
+	skipped   int64
+
+	// TODO(bradfitz): we could keep one large []byte and use part of it for
+	// the prefix, reserve space for the '... Omitting N bytes ...' message,
+	// then the ring buffer suffix, and just rearrange the ring buffer
+	// suffix when Bytes() is called, but it doesn't seem worth it for
+	// now just for error messages. It's only ~64KB anyway.
+}
+
+func (w *prefixSuffixSaver) Write(p []byte) (n int, err error) {
+	lenp := len(p)
+	p = w.fill(&w.prefix, p)
+
+	// Only keep the last w.N bytes of suffix data.
+	if overage := len(p) - w.N; overage > 0 {
+		p = p[overage:]
+		w.skipped += int64(overage)
+	}
+	p = w.fill(&w.suffix, p)
+
+	// w.suffix is full now if p is non-empty. Overwrite it in a circle.
+	for len(p) > 0 { // 0, 1, or 2 iterations.
+		n := copy(w.suffix[w.suffixOff:], p)
+		p = p[n:]
+		w.skipped += int64(n)
+		w.suffixOff += n
+		if w.suffixOff == w.N {
+			w.suffixOff = 0
+		}
+	}
+	return lenp, nil
+}
+
+// fill appends up to len(p) bytes of p to *dst, such that *dst does not
+// grow larger than w.N. It returns the un-appended suffix of p.
+func (w *prefixSuffixSaver) fill(dst *[]byte, p []byte) (pRemain []byte) {
+	if remain := w.N - len(*dst); remain > 0 {
+		add := minInt(len(p), remain)
+		*dst = append(*dst, p[:add]...)
+		p = p[add:]
+	}
+	return p
+}
+
+func (w *prefixSuffixSaver) Bytes() []byte {
+	if w.suffix == nil {
+		return w.prefix
+	}
+	if w.skipped == 0 {
+		return append(w.prefix, w.suffix...)
+	}
+	var buf bytes.Buffer
+	buf.Grow(len(w.prefix) + len(w.suffix) + 50)
+	buf.Write(w.prefix)
+	buf.WriteString("\n... omitting ")
+	buf.WriteString(strconv.FormatInt(w.skipped, 10))
+	buf.WriteString(" bytes ...\n")
+	buf.Write(w.suffix[w.suffixOff:])
+	buf.Write(w.suffix[:w.suffixOff])
+	return buf.Bytes()
+}
+
+func minInt(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
+//end copied from Go 1.6 exec.go