src/usr.bin/ssh/scp.c - diff

Return to scp.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.247, 2022/03/20 08:52:17

version 1.248, 2022/05/13 06:31:50

Line 1278

if (src_is_dir && iamrecursive) {

if (upload_dir(conn, src, abs_dst, pflag,

SFTP_PROGRESS_ONLY, 0, 0, 1) != 0) {

SFTP_PROGRESS_ONLY, 0, 0, 1, 1) != 0) {

error("failed to upload directory %s to %s", src, targ);

errs = 1;

}

} else if (do_upload(conn, src, abs_dst, pflag, 0, 0) != 0) {

} else if (do_upload(conn, src, abs_dst, pflag, 0, 0, 1) != 0) {

error("failed to upload file %s to %s", src, targ);

errs = 1;

}

Line 1519

debug("Fetching %s to %s\n", g.gl_pathv[i], abs_dst);

if (globpath_is_dir(g.gl_pathv[i]) && iamrecursive) {

if (download_dir(conn, g.gl_pathv[i], abs_dst, NULL,

pflag, SFTP_PROGRESS_ONLY, 0, 0, 1) == -1)

pflag, SFTP_PROGRESS_ONLY, 0, 0, 1, 1) == -1)

err = -1;

} else {

if (do_download(conn, g.gl_pathv[i], abs_dst, NULL,

pflag, 0, 0) == -1)

pflag, 0, 0, 1) == -1)

err = -1;

}

free(abs_dst);