pkg/system: deprecate EscapeArgs and move internal

thaJeztah · thaJeztah · commit 63bada41e562 · 2025-07-12T19:49:22.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/internal/libcontainerd/local/local_windows.go b/daemon/internal/libcontainerd/local/local_windows.go
@@ -24,7 +24,6 @@ import (
 	"github.com/docker/docker/daemon/internal/libcontainerd/queue"
 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/system"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows"
@@ -532,10 +531,19 @@ func setCommandLineAndArgs(process *specs.Process, createProcessParms *hcsshim.P
 	if process.CommandLine != "" {
 		createProcessParms.CommandLine = process.CommandLine
 	} else {
-		createProcessParms.CommandLine = system.EscapeArgs(process.Args)
+		createProcessParms.CommandLine = escapeArgs(process.Args)
 	}
 }
 
+// escapeArgs makes a Windows-style escaped command line from a set of arguments
+func escapeArgs(args []string) string {
+	escapedArgs := make([]string, len(args))
+	for i, a := range args {
+		escapedArgs[i] = windows.EscapeArg(a)
+	}
+	return strings.Join(escapedArgs, " ")
+}
+
 func newIOFromProcess(newProcess hcsshim.Process, terminal bool) (*cio.DirectIO, error) {
 	stdin, stdout, stderr, err := newProcess.Stdio()
 	if err != nil {
diff --git a/daemon/oci_windows.go b/daemon/oci_windows.go
@@ -19,9 +19,9 @@ import (
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/oci"
-	"github.com/docker/docker/pkg/system"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
+	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 )
 
@@ -240,7 +240,7 @@ func (daemon *Daemon) createSpecWindowsFields(c *container.Container, s *specs.S
 	if c.Config.ArgsEscaped {
 		s.Process.CommandLine = c.Path
 		if len(c.Args) > 0 {
-			s.Process.CommandLine += " " + system.EscapeArgs(c.Args)
+			s.Process.CommandLine += " " + escapeArgs(c.Args)
 		}
 	} else {
 		s.Process.Args = append([]string{c.Path}, c.Args...)
@@ -294,6 +294,15 @@ func (daemon *Daemon) createSpecWindowsFields(c *container.Container, s *specs.S
 	return nil
 }
 
+// escapeArgs makes a Windows-style escaped command line from a set of arguments
+func escapeArgs(args []string) string {
+	escapedArgs := make([]string, len(args))
+	for i, a := range args {
+		escapedArgs[i] = windows.EscapeArg(a)
+	}
+	return strings.Join(escapedArgs, " ")
+}
+
 // getBackingDeviceForContainerdMount extracts the backing device or directory mounted at mountPoint
 // by containerd's mount.Mount implementation for Windows.
 func getBackingDeviceForContainerdMount(mountPoint string) (string, error) {
diff --git a/pkg/system/args_windows.go b/pkg/system/args_windows.go
@@ -7,6 +7,8 @@ import (
 )
 
 // EscapeArgs makes a Windows-style escaped command line from a set of arguments
+//
+// Deprecated: this function is no longer used and will be removed in the next release.
 func EscapeArgs(args []string) string {
 	escapedArgs := make([]string, len(args))
 	for i, a := range args {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// EscapeArgs makes a Windows-style escaped command line from a set of arguments`
	`10`	`+//`
	`11`	`+// Deprecated: this function is no longer used and will be removed in the next release.`
`10`	`12`	`func EscapeArgs(args []string) string {`
`11`	`13`	`escapedArgs := make([]string, len(args))`
`12`	`14`	`for i, a := range args {`