Fix some file descriptors closing

[goredo.git] / run.go

diff --git a/run.go b/run.go
index 366240557fff22680d401ae11b3d7de2ddb3ed01..c0d6eda2fd0f31920d13034e28592fa05ace013c 100644 (file)
--- a/run.go
+++ b/run.go
@@ -69,10 +69,11 @@ var (
        StopIfMod    = false
        Jobs         sync.WaitGroup
 
-       flagTrace        *bool
-       flagTraceAll     *bool
-       flagStderrKeep   *bool
-       flagStderrSilent *bool
+       flagTrace          *bool
+       flagTraceAll       *bool
+       flagStderrKeep     *bool
+       flagStderrSilent   *bool
+       flagForcedIfchange *bool
 
        TracedAll bool
 
@@ -94,6 +95,7 @@ func init() {
                fmt.Sprintf("keep job's stderr (%s=1)", EnvStderrKeep))
        flagStderrSilent = flag.Bool("s", false,
                fmt.Sprintf("silent, do not print job's stderr (%s=1)", EnvStderrSilent))
+       flagForcedIfchange = flag.Bool("f", false, "forced redo-ifchange")
 }
 
 type RunError struct {
@@ -263,6 +265,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                Finish:
                        if err != nil {
                                err = TgtError{tgtOrig, err}
+                               fdLock.Close()
                        }
                        errs <- err
                }()
@@ -456,6 +459,9 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                runErr.Started = &started
                fdStdout, err = os.OpenFile(stdoutPath, os.O_RDWR, os.FileMode(0666))
                if err != nil {
+                       if fdStderr != nil {
+                               fdStderr.Close()
+                       }
                        runErr.Err = err
                        errs <- runErr
                        return
@@ -463,6 +469,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                cmd.Stdout = fdStdout
                fdDep, err = os.OpenFile(fdDepPath, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
                if err != nil {
+                       if fdStderr != nil {
+                               fdStderr.Close()
+                       }
+                       fdStdout.Close()
                        runErr.Err = err
                        errs <- runErr
                        return