Thanks to spacefrogg

[goredo.git] / run.go

diff --git a/run.go b/run.go
index ca8eebbcd9ca542dd7c9f31e77dfaca18eb4b7de..1e8472f3602b514f9335712028411f48f5c163a0 100644 (file)
--- a/run.go
+++ b/run.go
@@ -408,10 +408,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                } else {
                        cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
                        cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
-                       cmd.Env = append(cmd.Env, fmt.Sprintf(
-                               "%s=%s %s%d,%d",
-                               MakeFlagsName, MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
-                       ))
+                       makeFlags := fmt.Sprintf(
+                               "%s %s%d,%d", MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
+                       )
+                       makeFlags = strings.Trim(makeFlags, " ")
+                       cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", MakeFlagsName, makeFlags))
                        fdNum += 2
                        cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvJSToken, jsToken))
                }
@@ -456,10 +457,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                ); err == nil {
                                        fields := []recfile.Field{
                                                {Name: "Build", Value: BuildUUID},
-                                               {Name: "PID", Value: strconv.Itoa(cmd.Process.Pid)},
                                                {Name: "PPID", Value: strconv.Itoa(os.Getpid())},
                                                {Name: "Cwd", Value: cwd},
                                        }
+                                       if cmd.Process != nil {
+                                               fields = append(fields, recfile.Field{
+                                                       Name: "PID", Value: strconv.Itoa(cmd.Process.Pid),
+                                               })
+                                       }
                                        ts := new(tai64n.TAI64N)
                                        ts.FromTime(started)
                                        fields = append(fields,
@@ -474,7 +479,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                        })
                                        fields = append(fields, recfile.Field{Name: "Cmd", Value: cmdName})
                                        for _, arg := range args {
-                                               fields = append(fields, recfile.Field{Name: "Cmd", Value: arg})
+                                               fields = append(fields, recfile.Field{Name: "Arg", Value: arg})
                                        }
                                        for _, env := range cmd.Env {
                                                fields = append(fields, recfile.Field{Name: "Env", Value: env})
@@ -587,6 +592,29 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                }
 
                // Was $1 touched?
+               if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+                       errTouched := errors.New("$1 was explicitly touched")
+                       if inodePrev == nil {
+                               fd.Close()
+                               runErr.Err = errTouched
+                               errs <- runErr
+                               return
+                       } else {
+                               inode, err := inodeFromFile(fd)
+                               fd.Close()
+                               if err != nil {
+                                       runErr.Err = err
+                                       errs <- runErr
+                                       return
+                               }
+                               if !inode.Equals(inodePrev) {
+                                       runErr.Err = errTouched
+                                       errs <- runErr
+                                       return
+                               }
+                       }
+               }
+
                if inodePrev != nil {
                        if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
                                inode, err := inodeFromFile(fd)