Latest go.cypherpunks.ru/tai64n

[goredo.git] / run.go

diff --git a/run.go b/run.go
index af17eaa415a66df05439c3919a5ccac79ee6147a..2efd2d31a80e20917f0ee89a027da0f10354ddca 100644 (file)
--- a/run.go
+++ b/run.go
@@ -35,7 +35,7 @@ import (
        "time"
 
        "go.cypherpunks.ru/recfile"
-       "go.cypherpunks.ru/tai64n"
+       "go.cypherpunks.ru/tai64n/v2"
        "golang.org/x/sys/unix"
 )
 
@@ -345,6 +345,13 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
        ))
 
        fdNum := 0
+       cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgts)
+       cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsFd, 3+fdNum))
+       fdNum++
+       cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgtsLock)
+       cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsLockFd, 3+fdNum))
+       fdNum++
+
        if FdStatus == nil {
                cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvStatusFd))
        } else {
@@ -457,9 +464,9 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                        continue
                                }
                                if fdStderr != nil {
-                                       tai64n.FromTime(time.Now(), ts)
+                                       ts.FromTime(time.Now())
                                        LogMutex.Lock()
-                                       fmt.Fprintf(fdStderr, "%s %s\n", ts.Encode(), line)
+                                       fmt.Fprintf(fdStderr, "%s %s\n", tai64n.Encode(ts[:]), line)
                                        LogMutex.Unlock()
                                }
                                if StderrSilent {