Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-05-13 22:07:29 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

compilable on linux

Browse Source
This commit is contained in:
Ryo Nakamura
2022-10-23 16:42:20 +09:00
parent 7c18d42004
commit 0213b316c5
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/file.c
View File

@@ -142,7 +142,7 @@ static struct file *file_alloc(char *path, size_t size, bool remote)
} }
memset(f, 0, sizeof(*f)); memset(f, 0, sizeof(*f));
strncpy(f->path, path, PATH_MAX); strncpy(f->path, path, PATH_MAX - 1);
f->size = size; f->size = size;
f->remote = remote; f->remote = remote;
lock_init(&f->lock); lock_init(&f->lock);
@@ -250,7 +250,6 @@ static int file_fill_remote_recursive(char *path, sftp_session sftp,
ssh_get_error(sftp_ssh(sftp))); ssh_get_error(sftp_ssh(sftp)));
return -1; return -1;
} }
} else { } else {
/* path is file */ /* path is file */
attr = sftp_stat(sftp, path); attr = sftp_stat(sftp, path);
@@ -300,15 +299,23 @@ int file_fill_dst(char *target, struct list_head *file_list)
{ {
bool dst_remote = file_find_hostname(target) ? true : false; bool dst_remote = file_find_hostname(target) ? true : false;
char *dst_path = file_find_path(target); char *dst_path = file_find_path(target);
int pref_len, path_len;
struct file *f; struct file *f;
dst_path = *dst_path == '\0' ? "." : dst_path; dst_path = *dst_path == '\0' ? "." : dst_path;
list_for_each_entry(f, file_list, list) { list_for_each_entry(f, file_list, list) {
f->dst_remote = dst_remote; f->dst_remote = dst_remote;
strncat(f->dst_path, dst_path, PATH_MAX); pref_len = strlen(dst_path);
strncat(f->dst_path, "/", PATH_MAX); path_len = strlen(f->path);
strncat(f->dst_path, f->path, PATH_MAX); if (pref_len + path_len + 2 > PATH_MAX) { /* +2 is '/' and '\0' */
pr_err("too long path: %s/%s\n", dst_path, f->path);
return -1;
}
memcpy(f->dst_path, dst_path, pref_len);
f->dst_path[pref_len] = '/';
memcpy(f->dst_path + pref_len + 1, f->path, path_len);
f->dst_path[pref_len + 1 + path_len] = '\0';
} }
return 0; return 0;
@@ -590,7 +597,7 @@ static int chunk_copy_local_to_remote(struct chunk *c, sftp_session sftp, size_t
mode_t mode; mode_t mode;
int flags; int flags;
int fd = 0; int fd = 0;
int ret, ret2; int ret = 0, ret2;
flags = O_RDONLY; flags = O_RDONLY;
mode = S_IRUSR; mode = S_IRUSR;
@@ -659,7 +666,7 @@ static int chunk_copy_remote_to_local(struct chunk *c, sftp_session sftp, size_t
mode_t mode; mode_t mode;
int flags; int flags;
int fd = 0; int fd = 0;
int ret, ret2; int ret = 0, ret2;
flags = O_WRONLY|O_CREAT; flags = O_WRONLY|O_CREAT;
mode = S_IRUSR|S_IWUSR; mode = S_IRUSR|S_IWUSR;
@@ -721,7 +728,7 @@ out:
int chunk_copy(struct chunk *c, sftp_session sftp, size_t buf_sz, size_t *counter) int chunk_copy(struct chunk *c, sftp_session sftp, size_t buf_sz, size_t *counter)
{ {
struct file *f = c->f; struct file *f = c->f;
int ret; int ret = 0;
pr_debug("copy %s %s -> %s %s off=0x%010lx\n", pr_debug("copy %s %s -> %s %s off=0x%010lx\n",
f->path, f->remote ? "(remote)" : "(local)", f->path, f->remote ? "(remote)" : "(local)",
@@ -735,6 +742,10 @@ int chunk_copy(struct chunk *c, sftp_session sftp, size_t buf_sz, size_t *counte
if (ret < 0) if (ret < 0)
return ret; return ret;
pr_debug("done %s %s -> %s %s off=0x%010lx\n",
f->path, f->remote ? "(remote)" : "(local)",
f->dst_path, f->dst_remote ? "(remote)" : "(local)", c->off);
if (refcnt_dec(&f->refcnt) == 0) if (refcnt_dec(&f->refcnt) == 0)
f->state = FILE_STATE_DONE; f->state = FILE_STATE_DONE;