Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-03-14 04:13:28 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

capture retval from copy threads

Browse Source
This commit is contained in:
Ryo Nakamura
2022-11-01 00:17:05 +09:00
parent 07b9d8ca55
commit 7039b84c4f
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -50,6 +50,7 @@ struct mscp_thread {
pthread_t tid; pthread_t tid;
size_t done; /* copied bytes */ size_t done; /* copied bytes */
bool finished; bool finished;
int ret;
}; };
void *mscp_copy_thread(void *arg); void *mscp_copy_thread(void *arg);
@@ -372,8 +373,11 @@ int main(int argc, char **argv)
join_out: join_out:
/* waiting for threads join... */ /* waiting for threads join... */
for (n = 0; n < nr_threads; n++) for (n = 0; n < nr_threads; n++)
if (threads[n].tid) if (threads[n].tid) {
pthread_join(threads[n].tid, NULL); pthread_join(threads[n].tid, NULL);
if (threads[n].ret < 0)
ret = threads[n].ret;
}
if (mtid != 0) { if (mtid != 0) {
pthread_cancel(mtid); pthread_cancel(mtid);
@@ -414,11 +418,11 @@ void *mscp_copy_thread(void *arg)
if (!c) if (!c)
break; /* no more chunks */ break; /* no more chunks */
if (chunk_prepare(c, sftp) < 0) if ((t->ret = chunk_prepare(c, sftp)) < 0)
break; break;
if (chunk_copy(c, sftp, if ((t->ret = chunk_copy(c, sftp,
m->sftp_buf_sz, m->io_buf_sz, &t->done) < 0) m->sftp_buf_sz, m->io_buf_sz, &t->done)) < 0)
break; break;
} }

11
test/test_e2e.py
View File

@@ -149,3 +149,14 @@ def test_min_chunk(mscp, src_prefix, dst_prefix):
src.cleanup() src.cleanup()
dst.cleanup() dst.cleanup()
@pytest.mark.parametrize("src_prefix, dst_prefix", param_remote_prefix)
def test_cannot_override_file_with_dir(mscp, src_prefix, dst_prefix):
src = File("src", size = 128).make()
dst = File("dst").make()
run2ng([mscp, src_prefix + src.path, dst_prefix + "dst/src"])
src.cleanup()
dst.cleanup()