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

sftp: fix format problems, style nit and building problems

Browse Source 
Signed-off-by: tatataeki <shengzeyu19_98@163.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
tatataeki
2022-09-12 20:49:14 +08:00
committed by Jakub Jelen
parent 329d53a109
commit 0a5161a7d1
7 changed files with 91 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/server/test_server/sftpserver_cb.c
View File

@@ -71,7 +71,7 @@
#define MAX_HANDLE_NUM 10
#define MAX_ENTRIES_NUM_IN_PACKET 50
#define MAX_LONG_NAME_LEN 150
#define MAX_LONG_NAME_LEN 300
#define SSH_SFTP_CALLBACK(name) \
static int name (sftp_client_message message)
@@ -266,41 +266,30 @@ static const char* ssh_str_error(int u_errno) {
static int unix_errno_to_ssh_stat(int u_errno) {
int ret = SSH_OK;
switch (u_errno)
{
switch (u_errno) {
case 0:
break;
case ENOENT:
case ENOTDIR:
case EBADF:
case ELOOP:
{
ret = SSH_FX_NO_SUCH_FILE;
break;
}
case EPERM:
case EACCES:
case EFAULT:
{
ret = SSH_FX_PERMISSION_DENIED;
break;
}
case ENAMETOOLONG:
case EINVAL:
{
ret = SSH_FX_BAD_MESSAGE;
break;
}
case ENOSYS:
{
ret = SSH_FX_OP_UNSUPPORTED;
break;
}
default:
{
ret = SSH_FX_FAILURE;
break;
}
}
return ret;
@@ -437,13 +426,13 @@ static int process_open(sftp_client_message client_msg) {
file_flag = O_RDWR; //file must exist
if ((msg_flag & (uint32_t)SSH_FXF_CREAT) == SSH_FXF_CREAT)
file_flag |= O_CREAT;
} else if ( (msg_flag&(uint32_t)SSH_FXF_WRITE) == SSH_FXF_WRITE ){
} else if ( (msg_flag&(uint32_t)SSH_FXF_WRITE) == SSH_FXF_WRITE ) {
file_flag = O_WRONLY;
if ( (msg_flag&(uint32_t)SSH_FXF_APPEND) == SSH_FXF_APPEND )
file_flag |= O_APPEND;
if ( (msg_flag&(uint32_t)SSH_FXF_CREAT) == SSH_FXF_CREAT )
file_flag |= O_CREAT;
} else if ( (msg_flag&(uint32_t)SSH_FXF_READ) == SSH_FXF_READ ){
} else {
file_flag = O_RDONLY;
}

14
tests/server/torture_sftpserver.c
View File

@@ -123,18 +123,6 @@ static int setup_default_server(void **state)
torture_write_file(ecdsa_hostkey,
torture_get_testkey(SSH_KEYTYPE_ECDSA_P521, 0));
// sftp_server = getenv("TORTURE_SFTP_SERVER");
// if (sftp_server == NULL) {
// for (i = 0; i < sftp_sl_size; i++) {
// sftp_server = sftp_server_locations[i];
// rc = lstat(sftp_server, &sb);
// if (rc == 0) {
// break;
// }
// }
// }
// assert_non_null(sftp_server);
/* Create default server state */
ss = (struct server_state_st *)calloc(1, sizeof(struct server_state_st));
assert_non_null(ss);
@@ -442,7 +430,7 @@ static void torture_server_test_sftp_function(void **state)
assert_non_null(fichier);
to = sftp_open(sftp, "ssh-copy", O_WRONLY | O_CREAT, 0700);
assert_non_null(fichier);
assert_non_null(to);
read_len = sftp_read(fichier, data, 4096);
write_len = sftp_write(to, data, read_len);