From 24c1bc9149eb8f1c383eaf16d94636b62d07c152 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Fri, 4 Aug 2023 15:06:14 +0900 Subject: do not set O_TRUNC when opening destination file. It prevents `mscp localhost:hoge ~/hoge` from truncating the source file. See https://bugzilla.mindrot.org/show_bug.cgi?id=3431. https://github.com/upa/mscp/issues/1 --- src/fileops.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/fileops.c') diff --git a/src/fileops.c b/src/fileops.c index 994dd77..d9587ef 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -293,15 +293,24 @@ int mscp_lseek(mf *f, size_t off) return ret; } -int mscp_chmod(const char *path, mode_t mode, sftp_session sftp) +int mscp_setstat(const char *path, mode_t mode, size_t size, sftp_session sftp) { int ret; if (sftp) { - ret = sftp_chmod(sftp, path, mode); + struct sftp_attributes_struct attr; + memset(&attr, 0, sizeof(attr)); + attr.permissions = mode; + attr.size = size; + attr.flags = (SSH_FILEXFER_ATTR_PERMISSIONS|SSH_FILEXFER_ATTR_SIZE); + ret = sftp_setstat(sftp, path, &attr); sftp_err_to_errno(sftp); - } else - ret = chmod(path, mode); + } else { + if ((ret = chmod(path, mode)) < 0) + return ret; + if ((ret = truncate(path, size)) < 0) + return ret; + } return ret; } -- cgit v1.2.3