lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

sftp: Use ssh_buffer_pack() in sftp_mkdir()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-08-31 18:42:33 +02:00
parent 89c525bbf1
commit 218c67a51d
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/sftp.c
View File

@@ -2234,7 +2234,6 @@ int sftp_mkdir(sftp_session sftp, const char *directory, mode_t mode)
sftp_attributes errno_attr = NULL; sftp_attributes errno_attr = NULL;
struct sftp_attributes_struct attr; struct sftp_attributes_struct attr;
ssh_buffer buffer; ssh_buffer buffer;
ssh_string path;
uint32_t id; uint32_t id;
int rc; int rc;
@@ -2244,38 +2243,34 @@ int sftp_mkdir(sftp_session sftp, const char *directory, mode_t mode)
return -1; return -1;
} }
path = ssh_string_from_char(directory);
if (path == NULL) {
ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer);
return -1;
}
ZERO_STRUCT(attr); ZERO_STRUCT(attr);
attr.permissions = mode; attr.permissions = mode;
attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS; attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS;
rc = ssh_buffer_allocate_size(buffer, id = sftp_get_new_id(sftp);
sizeof(uint32_t) * 2 +
ssh_string_len(path)); rc = ssh_buffer_pack(buffer,
if (rc < 0) { "ds",
id,
directory);
if (rc != SSH_OK) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(path);
return -1; return -1;
} }
id = sftp_get_new_id(sftp); rc = buffer_add_attributes(buffer, &attr);
if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 || if (rc < 0) {
ssh_buffer_add_ssh_string(buffer, path) < 0 || ssh_set_error_oom(sftp->session);
buffer_add_attributes(buffer, &attr) < 0 ||
sftp_packet_write(sftp, SSH_FXP_MKDIR, buffer) < 0) {
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(path);
return -1; return -1;
} }
rc = sftp_packet_write(sftp, SSH_FXP_MKDIR, buffer);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
ssh_string_free(path); if (rc < 0) {
return -1;
}
while (msg == NULL) { while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) { if (sftp_read_and_dispatch(sftp) < 0) {