Report error if no filename is remote

adonovan · adonovan · commit 8fb5e5e1d519 · 2021-10-20T14:21:22.000-04:00
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -193,16 +193,18 @@ users; see https://lwn.net/Articles/835962/ for discussion.
 
 // Copy copies files between the local and remote file systems.
 // The mechanics are similar to 'ssh' but using 'scp'.
-func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) (err error) {
+func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) error {
 	if len(args) < 2 {
 		return fmt.Errorf("cp requires source and destination arguments")
 	}
 	if opts.recursive {
 		opts.scpArgs = append(opts.scpArgs, "-r")
 	}
 	opts.scpArgs = append(opts.scpArgs, "--")
+	hasRemote := false
 	for _, arg := range args {
 		if rest := strings.TrimPrefix(arg, "remote:"); rest != arg {
+			hasRemote = true
 			// scp treats each filename argument as a shell expression,
 			// subjecting it to expansion of environment variables, braces,
 			// tilde, backticks, globs and so on. Because these present a
@@ -225,6 +227,9 @@ func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) (err erro
 		}
 		opts.scpArgs = append(opts.scpArgs, arg)
 	}
+	if !hasRemote {
+		return fmt.Errorf("cp: no argument is a 'remote:' filename")
+	}
 	return a.SSH(ctx, nil, opts.sshOptions)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -193,16 +193,18 @@ users; see https://lwn.net/Articles/835962/ for discussion.`
`193`	`193`
`194`	`194`	`// Copy copies files between the local and remote file systems.`
`195`	`195`	`// The mechanics are similar to 'ssh' but using 'scp'.`
`196`		`-func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) (err error) {`
	`196`	`+func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) error {`
`197`	`197`	`if len(args) < 2 {`
`198`	`198`	`return fmt.Errorf("cp requires source and destination arguments")`
`199`	`199`	`}`
`200`	`200`	`if opts.recursive {`
`201`	`201`	`opts.scpArgs = append(opts.scpArgs, "-r")`
`202`	`202`	`}`
`203`	`203`	`opts.scpArgs = append(opts.scpArgs, "--")`
	`204`	`+ hasRemote := false`
`204`	`205`	`for _, arg := range args {`
`205`	`206`	`if rest := strings.TrimPrefix(arg, "remote:"); rest != arg {`
	`207`	`+ hasRemote = true`
`206`	`208`	`// scp treats each filename argument as a shell expression,`
`207`	`209`	`// subjecting it to expansion of environment variables, braces,`
`208`	`210`	`// tilde, backticks, globs and so on. Because these present a`
`@@ -225,6 +227,9 @@ func (a *App) Copy(ctx context.Context, args []string, opts cpOptions) (err erro`
`225`	`227`	`}`
`226`	`228`	`opts.scpArgs = append(opts.scpArgs, arg)`
`227`	`229`	`}`
	`230`	`+ if !hasRemote {`
	`231`	`+ return fmt.Errorf("cp: no argument is a 'remote:' filename")`
	`232`	`+ }`
`228`	`233`	`return a.SSH(ctx, nil, opts.sshOptions)`
`229`	`234`	`}`
`230`	`235`