Serialise stderr writing

[goredo.git] / run.go

diff --git a/run.go b/run.go
index 33857bfc5c3fb227d3fa43f17ae0669cc8409cc1..037e7bd330433a16fd19f4f80e17e22c4d9e1a95 100644 (file)
--- a/run.go
+++ b/run.go
@@ -628,7 +628,9 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
                                line = scanner.Text()
                                if strings.HasPrefix(line, childStderrPrefix) {
                                        line = line[len(childStderrPrefix):]
+                                       LogMutex.Lock()
                                        os.Stderr.WriteString(StderrPrefix + line + "\n")
+                                       LogMutex.Unlock()
                                        continue
                                }
                                if fdStderr != nil {
@@ -702,12 +704,18 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 
                // Determine what file we must process at last
                var fd *os.File
+               var chmod fs.FileMode
                if tmpExists {
                        fd, err = os.Open(tmpPath)
                        if err != nil {
                                err = ErrLine(err)
                                goto Finish
                        }
+                       if fi, rerr := fd.Stat(); rerr == nil {
+                               chmod = fi.Mode()
+                       } else {
+                               err = rerr
+                       }
                        defer fd.Close()
                } else if fiStdout.Size() > 0 {
                        fd = fdStdout
@@ -740,6 +748,12 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
                                        if err != nil {
                                                goto Finish
                                        }
+                                       if chmod != 0 {
+                                               err = ErrLine(os.Chmod(tgt.a, chmod))
+                                               if err != nil {
+                                                       goto Finish
+                                               }
+                                       }
                                        err = ErrLine(os.Chtimes(tgt.a, finished, finished))
                                        if err != nil {
                                                goto Finish