Rename system.IO to system.Cmd. Add Path field.

wetware · Nov 18, 2024 · d3270cf · d3270cf
1 parent 4255881
commit d3270cf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/cmd/internal/run/run.go b/cmd/internal/run/run.go
@@ -77,8 +77,9 @@ func run() cli.ActionFunc {
 		defer wasi.Close(c.Context)
 
 		return ww.Env{
-			IO: system.IO{
-				Args:   c.Args().Slice(),
+			Cmd: system.Cmd{
+				Path:   c.Args().First(),
+				Args:   c.Args().Tail(),
 				Env:    c.StringSlice("env"),
 				Stdin:  stdin(c),
 				Stdout: c.App.Writer,

diff --git a/cmd/internal/serve/serve.go b/cmd/internal/serve/serve.go
@@ -73,8 +73,9 @@ func Command() *cli.Command {
 				IPFS: ipfs,
 				Host: h,
 				Env: ww.Env{
-					IO: system.IO{
-						Args:   c.Args().Slice(),
+					Cmd: system.Cmd{
+						Path:   c.Args().First(),
+						Args:   c.Args().Tail(),
 						Env:    c.StringSlice("env"),
 						Stdin:  stdin(c),
 						Stdout: c.App.Writer,

diff --git a/proc/proc.go b/proc/proc.go
@@ -17,6 +17,7 @@ import (
 )
 
 type Command struct {
+	Path           string
 	Args, Env      []string
 	Stdout, Stderr io.Writer
 }

diff --git a/system/io.go → system/cmd.go b/system/io.go → system/cmd.go
@@ -2,7 +2,8 @@ package system
 
 import "io"
 
-type IO struct {
+type Cmd struct {
+	Path           string
 	Stdin          io.Reader
 	Stdout, Stderr io.Writer
 	Args, Env      []string

diff --git a/ww.go b/ww.go
@@ -25,13 +25,13 @@ var Proto = protoutils.VersionedID{
 }
 
 type Env struct {
-	IO  system.IO
+	Cmd system.Cmd
 	Net system.Net
 	FS  system.FS
 }
 
 func (env Env) Bind(ctx context.Context, r wazero.Runtime) error {
-	cm, err := env.LoadAndCompile(ctx, r, env.IO.Args[0]) // FIXME:  panic if len(args)=0
+	cm, err := env.LoadAndCompile(ctx, r, env.Cmd.Path) // FIXME:  panic if len(args)=0
 	if err != nil {
 		return err
 	}
@@ -60,7 +60,7 @@ func (env Env) Bind(ctx context.Context, r wazero.Runtime) error {
 		return err
 	}
 
-	if b, err := io.ReadAll(env.IO.Stdin); err != nil {
+	if b, err := io.ReadAll(env.Cmd.Stdin); err != nil {
 		return err
 	} else if err := call.SetCallData(b); err != nil {
 		return err
@@ -78,10 +78,11 @@ func (env Env) Bind(ctx context.Context, r wazero.Runtime) error {
 
 func (env Env) Instantiate(ctx context.Context, r wazero.Runtime, cm wazero.CompiledModule) (*proc.P, error) {
 	return proc.Command{
-		Args:   env.IO.Args,
-		Env:    env.IO.Env,
-		Stdout: env.IO.Stdout,
-		Stderr: env.IO.Stderr,
+		Path:   env.Cmd.Path,
+		Args:   env.Cmd.Args,
+		Env:    env.Cmd.Env,
+		Stdout: env.Cmd.Stdout,
+		Stderr: env.Cmd.Stderr,
 	}.Instantiate(ctx, r, cm)
 }