diff options
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | test/test_e2e.py | 11 |
2 files changed, 19 insertions, 4 deletions
@@ -50,6 +50,7 @@ struct mscp_thread { pthread_t tid; size_t done; /* copied bytes */ bool finished; + int ret; }; void *mscp_copy_thread(void *arg); @@ -372,8 +373,11 @@ int main(int argc, char **argv) join_out: /* waiting for threads join... */ for (n = 0; n < nr_threads; n++) - if (threads[n].tid) + if (threads[n].tid) { pthread_join(threads[n].tid, NULL); + if (threads[n].ret < 0) + ret = threads[n].ret; + } if (mtid != 0) { pthread_cancel(mtid); @@ -414,11 +418,11 @@ void *mscp_copy_thread(void *arg) if (!c) break; /* no more chunks */ - if (chunk_prepare(c, sftp) < 0) + if ((t->ret = chunk_prepare(c, sftp)) < 0) break; - if (chunk_copy(c, sftp, - m->sftp_buf_sz, m->io_buf_sz, &t->done) < 0) + if ((t->ret = chunk_copy(c, sftp, + m->sftp_buf_sz, m->io_buf_sz, &t->done)) < 0) break; } diff --git a/test/test_e2e.py b/test/test_e2e.py index 5d5dfaa..e2fd9d1 100644 --- a/test/test_e2e.py +++ b/test/test_e2e.py @@ -149,3 +149,14 @@ def test_min_chunk(mscp, src_prefix, dst_prefix): src.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() + |