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

fix dst path resolve

Browse Source
This commit is contained in:
Ryo Nakamura
2023-02-26 23:42:25 +09:00
parent 700d64b375
commit c649742b3e
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mscp.c
View File

@@ -297,7 +297,7 @@ int mscp_set_dst_path(struct mscp *m, const char *dst_path)
int mscp_prepare(struct mscp *m) int mscp_prepare(struct mscp *m)
{ {
sftp_session src_sftp = NULL, dst_sftp = NULL; sftp_session src_sftp = NULL, dst_sftp = NULL;
bool src_path_is_dir, dst_path_is_dir; bool src_path_is_dir, dst_path_is_dir, dst_path_should_dir = false;
struct list_head tmp; struct list_head tmp;
struct src *s; struct src *s;
mstat ss, ds; mstat ss, ds;
@@ -316,6 +316,9 @@ int mscp_prepare(struct mscp *m)
return -1; return -1;
} }
if (list_count(&m->src_list) > 1)
dst_path_should_dir = true;
if (mscp_stat(m->dst_path, &ds, dst_sftp) == 0) { if (mscp_stat(m->dst_path, &ds, dst_sftp) == 0) {
if (mstat_is_dir(ds)) if (mstat_is_dir(ds))
dst_path_is_dir = true; dst_path_is_dir = true;
@@ -336,8 +339,12 @@ int mscp_prepare(struct mscp *m)
if (walk_src_path(src_sftp, s->path, &tmp) < 0) if (walk_src_path(src_sftp, s->path, &tmp) < 0)
return -1; return -1;
if (list_count(&tmp) > 1)
dst_path_should_dir = true;
if (resolve_dst_path(s->path, m->dst_path, &tmp, if (resolve_dst_path(s->path, m->dst_path, &tmp,
src_path_is_dir, dst_path_is_dir) < 0) src_path_is_dir, dst_path_is_dir,
dst_path_should_dir) < 0)
return -1; return -1;
list_splice_tail(&tmp, m->path_list.prev); list_splice_tail(&tmp, m->path_list.prev);

23
src/path.c
View File

@@ -104,7 +104,8 @@ int walk_src_path(sftp_session src_sftp, const char *src_path,
static int src2dst_path(const char *src_path, const char *src_file_path, static int src2dst_path(const char *src_path, const char *src_file_path,
const char *dst_path, char *dst_file_path, size_t len, const char *dst_path, char *dst_file_path, size_t len,
bool src_path_is_dir, bool dst_path_is_dir) bool src_path_is_dir, bool dst_path_is_dir,
bool dst_path_should_dir)
{ {
char copy[PATH_MAX]; char copy[PATH_MAX];
char *prefix; char *prefix;
@@ -121,10 +122,16 @@ static int src2dst_path(const char *src_path, const char *src_file_path,
else else
offset = strlen(prefix) + 1; offset = strlen(prefix) + 1;
if (!src_path_is_dir && !dst_path_is_dir) {
/* both are file */ /* src path is file. dst path is (1) file, or (2) does not exist.
if (!src_path_is_dir && !dst_path_is_dir) * In the second case, we need to put src under the dst.
strncpy(dst_file_path, dst_path, len); */
if (dst_path_should_dir)
snprintf(dst_file_path, len, "%s/%s",
dst_path, src_path + offset);
else
strncpy(dst_file_path, dst_path, len);
}
/* src is file, and dst is dir */ /* src is file, and dst is dir */
if (!src_path_is_dir && dst_path_is_dir) if (!src_path_is_dir && dst_path_is_dir)
@@ -145,13 +152,15 @@ static int src2dst_path(const char *src_path, const char *src_file_path,
} }
int resolve_dst_path(const char *src_path, const char *dst_path, int resolve_dst_path(const char *src_path, const char *dst_path,
struct list_head *path_list, bool src_is_dir, bool dst_is_dir) struct list_head *path_list, bool src_path_is_dir,
bool dst_path_is_dir, bool dst_path_should_dir)
{ {
struct path *p; struct path *p;
list_for_each_entry(p, path_list, list) { list_for_each_entry(p, path_list, list) {
if (src2dst_path(src_path, p->path, dst_path, p->dst_path, PATH_MAX, if (src2dst_path(src_path, p->path, dst_path, p->dst_path, PATH_MAX,
src_is_dir, dst_is_dir) < 0) src_path_is_dir, dst_path_is_dir,
dst_path_should_dir) < 0)
return -1; return -1;
} }

3
src/path.h
View File

@@ -45,7 +45,8 @@ int walk_src_path(sftp_session src_sftp, const char *src_path,
/* fill path->dst_path for all files */ /* fill path->dst_path for all files */
int resolve_dst_path(const char *src_path, const char *dst_path, int resolve_dst_path(const char *src_path, const char *dst_path,
struct list_head *path_list, struct list_head *path_list,
bool src_path_is_dir, bool dst_path_is_dir); bool src_path_is_dir, bool dst_path_is_dir,
bool dst_path_should_dir);
/* resolve chunks from files in the path_list */ /* resolve chunks from files in the path_list */
int resolve_chunk(struct list_head *path_list, struct list_head *chunk_list, int resolve_chunk(struct list_head *path_list, struct list_head *chunk_list,