fix: use path.Join for guest paths, pass FollowLinks to CpToInstance

Author: rgarcia

lib/cp.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"syscall"
@@ -185,12 +186,13 @@ func CpToInstance(ctx context.Context, cfg CpConfig, opts CpToInstanceOptions) e
 
 	// Send initial request
 	req := cpRequest{
-		Direction: "to",
-		GuestPath: opts.DstPath,
-		IsDir:     srcInfo.IsDir(),
-		Mode:      uint32(mode),
-		Uid:       uid,
-		Gid:       gid,
+		Direction:   "to",
+		GuestPath:   opts.DstPath,
+		IsDir:       srcInfo.IsDir(),
+		Mode:        uint32(mode),
+		FollowLinks: opts.FollowLinks,
+		Uid:         uid,
+		Gid:         gid,
 	}
 	reqJSON, _ := json.Marshal(req)
 	if err := ws.WriteMessage(websocket.TextMessage, reqJSON); err != nil {
@@ -292,21 +294,23 @@ func copyDirToWs(ctx context.Context, cfg CpConfig, ws WsConn, srcPath, dstPath,
 	}
 
 	// Now recursively copy contents
-	return filepath.WalkDir(srcPath, func(path string, d fs.DirEntry, err error) error {
+	return filepath.WalkDir(srcPath, func(walkPath string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 
-		if path == srcPath {
+		if walkPath == srcPath {
 			return nil // Skip root
 		}
 
-		relPath, err := filepath.Rel(srcPath, path)
+		relPath, err := filepath.Rel(srcPath, walkPath)
 		if err != nil {
 			return fmt.Errorf("relative path: %w", err)
 		}
 
-		targetPath := filepath.Join(dstPath, relPath)
+		// Use path.Join (not filepath.Join) for guest paths to ensure forward slashes
+		// Convert Windows backslashes to forward slashes for Linux guest
+		targetPath := path.Join(dstPath, filepath.ToSlash(relPath))
 		info, err := d.Info()
 		if err != nil {
 			return fmt.Errorf("info: %w", err)
@@ -316,7 +320,7 @@ func copyDirToWs(ctx context.Context, cfg CpConfig, ws WsConn, srcPath, dstPath,
 		// This is because the protocol is one-file-per-connection
 		return CpToInstance(ctx, cfg, CpToInstanceOptions{
 			InstanceID: instanceID,
-			SrcPath:    path,
+			SrcPath:    walkPath,
 			DstPath:    targetPath,
 			Mode:       info.Mode().Perm(),
 			Callbacks:  callbacks,