shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

sftp: Use ssh_buffer_pack in sftp_open()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-08-31 18:37:39 +02:00
parent bfb6718b50
commit 2c0baef7d4
1 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/sftp.c
View File

@@ -1627,7 +1627,6 @@ sftp_file sftp_open(sftp_session sftp,
sftp_status_message status; sftp_status_message status;
struct sftp_attributes_struct attr; struct sftp_attributes_struct attr;
sftp_file handle; sftp_file handle;
ssh_string filename;
ssh_buffer buffer; ssh_buffer buffer;
sftp_attributes stat_data; sftp_attributes stat_data;
uint32_t sftp_flags = 0; uint32_t sftp_flags = 0;
@@ -1640,13 +1639,6 @@ sftp_file sftp_open(sftp_session sftp,
return NULL; return NULL;
} }
filename = ssh_string_from_char(file);
if (filename == NULL) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
return NULL;
}
ZERO_STRUCT(attr); ZERO_STRUCT(attr);
attr.permissions = mode; attr.permissions = mode;
attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS; attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS;
@@ -1668,36 +1660,31 @@ sftp_file sftp_open(sftp_session sftp,
sftp_flags |= SSH_FXF_APPEND; sftp_flags |= SSH_FXF_APPEND;
} }
SSH_LOG(SSH_LOG_PACKET,"Opening file %s with sftp flags %x",file,sftp_flags); SSH_LOG(SSH_LOG_PACKET,"Opening file %s with sftp flags %x",file,sftp_flags);
rc = ssh_buffer_allocate_size(buffer, id = sftp_get_new_id(sftp);
sizeof(uint32_t) * 4 +
ssh_string_len(filename)); rc = ssh_buffer_pack(buffer,
"dsd",
id,
file,
sftp_flags);
if (rc != SSH_OK) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
return NULL;
}
rc = buffer_add_attributes(buffer, &attr);
if (rc < 0) { if (rc < 0) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(filename);
return NULL; return NULL;
} }
id = sftp_get_new_id(sftp);
if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 ||
ssh_buffer_add_ssh_string(buffer, filename) < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
ssh_string_free(filename);
return NULL;
}
ssh_string_free(filename);
if (ssh_buffer_add_u32(buffer, htonl(sftp_flags)) < 0 || rc = sftp_packet_write(sftp, SSH_FXP_OPEN, buffer);
buffer_add_attributes(buffer, &attr) < 0) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
return NULL;
}
if (sftp_packet_write(sftp, SSH_FXP_OPEN, buffer) < 0) {
ssh_buffer_free(buffer);
return NULL;
}
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
if (rc < 0) {
return NULL;
}
while (msg == NULL) { while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) { if (sftp_read_and_dispatch(sftp) < 0) {