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

scp: More correct fix for snprintf 64-bit format.

Browse Source
This commit is contained in:
Andreas Schneider
2011-04-15 18:55:30 +02:00
parent e7e4f261a6
commit a6c53d51de
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libssh/priv.h
View File

@ -39,6 +39,14 @@
# define PRIdS "Id" # define PRIdS "Id"
# endif # endif
# ifndef PRIu64
# if __WORDSIZE == 64
# define PRIu64 "lu"
# else
# define PRIu64 "llu"
# endif /* __WORDSIZE */
# endif /* PRIu64 */
# ifdef _MSC_VER # ifdef _MSC_VER
# include <stdio.h> # include <stdio.h>

4
src/scp.c
View File

@ -293,8 +293,8 @@ int ssh_scp_push_file64(ssh_scp scp, const char *filename, uint64_t size, int mo
} }
file=ssh_basename(filename); file=ssh_basename(filename);
perms=ssh_scp_string_mode(mode); perms=ssh_scp_string_mode(mode);
ssh_log(scp->session,SSH_LOG_PROTOCOL,"SCP pushing file %s, size %llu with permissions '%s'",file,size,perms); ssh_log(scp->session,SSH_LOG_PROTOCOL,"SCP pushing file %s, size %" PRIu64 " with permissions '%s'",file,size,perms);
snprintf(buffer, sizeof(buffer), "C%s %llu %s\n", perms, size, file); snprintf(buffer, sizeof(buffer), "C%s %" PRIu64 " %s\n", perms, size, file);
SAFE_FREE(file); SAFE_FREE(file);
SAFE_FREE(perms); SAFE_FREE(perms);
r=ssh_channel_write(scp->channel,buffer,strlen(buffer)); r=ssh_channel_write(scp->channel,buffer,strlen(buffer));