scp.c: improved and streamlined formatting

This commit is contained in:
Marc Hoersken 2015-03-23 23:05:41 +01:00
parent 1e7988cb0d
commit 2d59b41daa

View File

@ -295,14 +295,15 @@ scp_recv(LIBSSH2_SESSION * session, const char *path, struct stat * sb)
} }
snprintf((char *)session->scpRecv_command, snprintf((char *)session->scpRecv_command,
session->scpRecv_command_len, "scp -%sf ", sb?"p":""); session->scpRecv_command_len,
"scp -%sf ", sb?"p":"");
cmd_len = strlen((char *)session->scpRecv_command); cmd_len = strlen((char *)session->scpRecv_command);
memset(&session->scpRecv_command[cmd_len], 0, memset(&session->scpRecv_command[cmd_len], 0,
session->scpRecv_command_len - cmd_len); session->scpRecv_command_len - cmd_len);
(void) shell_quotearg(path, (void)shell_quotearg(path,
&session->scpRecv_command[cmd_len], &session->scpRecv_command[cmd_len],
session->scpRecv_command_len - cmd_len); session->scpRecv_command_len - cmd_len);
@ -797,13 +798,16 @@ scp_send(LIBSSH2_SESSION * session, const char *path, int mode,
session->scpSend_command = session->scpSend_command =
LIBSSH2_ALLOC(session, session->scpSend_command_len); LIBSSH2_ALLOC(session, session->scpSend_command_len);
if (!session->scpSend_command) { if (!session->scpSend_command) {
_libssh2_error(session, LIBSSH2_ERROR_ALLOC, _libssh2_error(session, LIBSSH2_ERROR_ALLOC,
"Unable to allocate a command buffer for scp session"); "Unable to allocate a command buffer for "
"SCP session");
return NULL; return NULL;
} }
snprintf((char *)session->scpSend_command, session->scpSend_command_len, snprintf((char *)session->scpSend_command,
session->scpSend_command_len,
"scp -%st ", (mtime || atime)?"p":""); "scp -%st ", (mtime || atime)?"p":"");
cmd_len = strlen((char *)session->scpSend_command); cmd_len = strlen((char *)session->scpSend_command);