tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: when using SFTP protocol, continue transferring files after a 

transfer error occurs. This matches original scp/rcp behaviour. ok dtucker@

OpenBSD-Commit-ID: dfe4558d71dd09707e9b5d6e7d2e53b793da69fa
This commit is contained in:
djm@openbsd.org 2021-09-11 00:40:24 +00:00 committed by Damien Miller
parent b0ec59a708
commit ba61123eef
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.233 2021/09/08 23:31:39 djm Exp $ */ /* $OpenBSD: scp.c,v 1.234 2021/09/11 00:40:24 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -652,7 +652,7 @@ main(int argc, char **argv)
* Finally check the exit status of the ssh process, if one was forked * Finally check the exit status of the ssh process, if one was forked
* and no error has occurred yet * and no error has occurred yet
*/ */
if (do_cmd_pid != -1 && errs == 0) { if (do_cmd_pid != -1 && (mode == MODE_SFTP || errs == 0)) {
if (remin != -1) if (remin != -1)
(void) close(remin); (void) close(remin);
if (remout != -1) if (remout != -1)
@ -1296,11 +1296,14 @@ source_sftp(int argc, char *src, char *targ, struct sftp_conn *conn)
if (local_is_dir(src) && iamrecursive) { if (local_is_dir(src) && iamrecursive) {
if (upload_dir(conn, src, abs_dst, pflag, if (upload_dir(conn, src, abs_dst, pflag,
SFTP_PROGRESS_ONLY, 0, 0, 1) != 0) { SFTP_PROGRESS_ONLY, 0, 0, 1) != 0) {
fatal("failed to upload directory %s to %s", error("failed to upload directory %s to %s",
src, abs_dst); src, abs_dst);
errs = 1;
}
} else if (do_upload(conn, src, abs_dst, pflag, 0, 0) != 0) {
error("failed to upload file %s to %s", src, abs_dst);
errs = 1;
} }
} else if (do_upload(conn, src, abs_dst, pflag, 0, 0) != 0)
fatal("failed to upload file %s to %s", src, abs_dst);
free(abs_dst); free(abs_dst);
free(target); free(target);
@ -1538,7 +1541,8 @@ out:
free(tmp); free(tmp);
globfree(&g); globfree(&g);
if (err == -1) { if (err == -1) {
fatal("Failed to download file '%s'", src); error("Failed to download '%s'", src);
errs = 1;
} }
} }