diff --git a/src/client/client_cli.c b/src/client/client_cli.c index 924b37b..9fd67ac 100644 --- a/src/client/client_cli.c +++ b/src/client/client_cli.c @@ -207,6 +207,7 @@ static const OptionEntry OPTION_TABLE[] = { {"--delete", NULL, OPT_FLAG, offsetof(Config, use_delete)}, {"--incremental", NULL, OPT_FLAG, offsetof(Config, use_incremental)}, {"--delta", NULL, OPT_FLAG, offsetof(Config, use_delta)}, + {"--whole-file", "-W", OPT_FLAG, offsetof(Config, whole_file)}, {"--save-to-disk", NULL, OPT_FLAG, offsetof(Config, save_to_disk)}, {"--progress", NULL, OPT_FLAG, offsetof(Config, show_progress)}, {"--tls", NULL, OPT_FLAG, offsetof(Config, use_tls)}, diff --git a/src/client/client_send.c b/src/client/client_send.c index e15c7f0..3f4d64f 100644 --- a/src/client/client_send.c +++ b/src/client/client_send.c @@ -435,7 +435,7 @@ static int send_single_file(Client* client, File* file, Config* config, bool use delta_signature_destroy(sig); return 1; } - if (rc == 2 && config->use_delta) { + if (rc == 2 && config->use_delta && !config->whole_file) { int drc = send_delta(client, file, sig, config); delta_signature_destroy(sig); if (drc == 0) diff --git a/src/client/client_validation.c b/src/client/client_validation.c index 106580f..e807085 100644 --- a/src/client/client_validation.c +++ b/src/client/client_validation.c @@ -23,15 +23,15 @@ bool validate_config(const Config* config) { log_message(LOG_LEVEL_ERROR, "--incremental is not supported with -s (chunk serialization)"); return false; } - if (config->use_delta && !config->use_incremental) { + if (config->use_delta && !config->whole_file && !config->use_incremental) { log_message(LOG_LEVEL_ERROR, "--delta requires --incremental"); return false; } - if (config->use_delta && config->use_chunk_serialization) { + if (config->use_delta && !config->whole_file && config->use_chunk_serialization) { log_message(LOG_LEVEL_ERROR, "--delta cannot be combined with -s (chunk serialization)"); return false; } - if (config->use_delta && config->use_sendfile) { + if (config->use_delta && !config->whole_file && config->use_sendfile) { log_message(LOG_LEVEL_ERROR, "--delta cannot be combined with -f (sendfile)"); return false; } diff --git a/src/client/usage.c b/src/client/usage.c index 9025a82..6a2968b 100644 --- a/src/client/usage.c +++ b/src/client/usage.c @@ -31,6 +31,7 @@ void print_usage(void) { printf(" --min-size Skip files smaller than n bytes\n"); printf(" --incremental Skip files unchanged since last transfer\n"); printf(" --delta Delta transfer for changed files (requires --incremental)\n"); + printf(" -W, --whole-file Transfer changed files without delta processing\n"); printf(" --delta-block Delta block size in bytes (default: %d)\n", DELTA_BLOCK_SIZE_DEFAULT); printf(" --delta-max Max file size for delta transfer (default: %llu)\n", diff --git a/src/shared/config.c b/src/shared/config.c index cb496f9..3f45183 100644 --- a/src/shared/config.c +++ b/src/shared/config.c @@ -36,6 +36,7 @@ static void config_set_defaults(Config* config) { config->min_size = 0; config->use_incremental = false; config->use_delta = false; + config->whole_file = false; config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT; config->delta_max_file_size = DELTA_MAX_FILE_SIZE; config->use_tls = false; @@ -234,7 +235,7 @@ static bool send_core_fields(int fd, const Config* c) { static bool send_delta_fields(int fd, const Config* c) { return send_int(fd, c->use_delete) && send_int(fd, c->use_incremental) && - send_int(fd, c->use_delta) && + send_int(fd, c->use_delta && !c->whole_file) && send_n_data(fd, &c->delta_block_size, sizeof(c->delta_block_size)) && send_n_data(fd, &c->delta_max_file_size, sizeof(unsigned long long)); } diff --git a/src/shared/config.h b/src/shared/config.h index ea88f87..930268e 100644 --- a/src/shared/config.h +++ b/src/shared/config.h @@ -36,6 +36,7 @@ typedef struct Config { unsigned long long min_size; bool use_incremental; bool use_delta; + bool whole_file; uint32_t delta_block_size; unsigned long long delta_max_file_size; bool use_tls; diff --git a/src/shared/file_receive.c b/src/shared/file_receive.c index 3d3616d..cbca23c 100644 --- a/src/shared/file_receive.c +++ b/src/shared/file_receive.c @@ -403,7 +403,7 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) { return NULL; } - bool try_delta = config->use_delta && has_old_file && old_data != NULL && + bool try_delta = config->use_delta && !config->whole_file && has_old_file && old_data != NULL && delta_should_attempt(old_size, check_size, config->delta_max_file_size); if (try_delta) { diff --git a/tests/integration/test_features.py b/tests/integration/test_features.py index 382cd68..713383f 100644 --- a/tests/integration/test_features.py +++ b/tests/integration/test_features.py @@ -331,6 +331,27 @@ class TestIncremental: with open(received_file, "rb") as f: assert f.read() == b"hello world\n" + def test_whole_file_disables_delta_and_keeps_compression(self, shared_server): + clean_dir(DEST_DIR) + result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-M"], port=shared_server.port) + assert result.returncode == 0 + + source_file = os.path.join(SOURCE_DIR, "medium.txt") + with open(source_file, "wb") as f: + f.write(b"whole-file replacement\n" * 5000) + + result, _ = run_client( + SOURCE_DIR, + DEST_DIR, + flags=["-M", "--incremental", "--delta", "-W", "-c"], + port=shared_server.port, + ) + assert result.returncode == 0, f"Whole-file sync failed: {(result.stderr or result.stdout)[:200]}" + received = get_dest_received_dir(DEST_DIR, SOURCE_DIR) + mismatches, missing = verify_transfer(SOURCE_DIR, received) + assert not missing, f"Missing: {missing}" + assert not mismatches, f"Mismatch: {mismatches}" + class TestDelete: def test_delete_removes_extra_files(self, shared_server): diff --git a/tests/test_client_cli.c b/tests/test_client_cli.c index 22e4fb3..6755668 100644 --- a/tests/test_client_cli.c +++ b/tests/test_client_cli.c @@ -60,6 +60,13 @@ static void test_validate_config_delta_sendfile_constraints() { cfg->use_incremental = true; cfg->use_sendfile = true; EXPECT_FALSE(validate_config(cfg)); + + /* Whole-file makes delta selection inactive, so these combinations are valid. */ + cfg->whole_file = true; + EXPECT_TRUE(validate_config(cfg)); + + cfg->use_incremental = false; + EXPECT_TRUE(validate_config(cfg)); config_delete(cfg); } @@ -507,6 +514,27 @@ static void test_parse_args_rejects_unsupported_stderr_modes() { } log_set_stderr_mode(LOG_STDERR_ERRORS); } + +/* Test both whole-file spellings and its precedence over delta selection. */ +static void test_parse_args_whole_file() { + Config* cfg = config_create(); + char* argv[] = {"fastsync", "--delta", "--incremental", "-W", "/src", "/dst"}; + int positional_args[2]; + int positional_count = 0; + + EXPECT_EQ_INT(parse_args(cfg, 6, argv, positional_args, &positional_count), 0); + EXPECT_TRUE(cfg->whole_file); + EXPECT_TRUE(cfg->use_delta); + + config_delete(cfg); + cfg = config_create(); + char* long_argv[] = {"fastsync", "--whole-file", "/src", "/dst"}; + positional_count = 0; + EXPECT_EQ_INT(parse_args(cfg, 4, long_argv, positional_args, &positional_count), 0); + EXPECT_TRUE(cfg->whole_file); + config_delete(cfg); +} + void test_client_cli() { test_validate_config_required_paths(); test_validate_config_incompatible_options(); @@ -541,4 +569,5 @@ void test_client_cli() { test_parse_args_rejects_unsupported_stderr_modes(); test_parse_args_secluded_args(); test_parse_args_short_s_remains_chunk_serialization(); + test_parse_args_whole_file(); } diff --git a/tests/test_config.c b/tests/test_config.c index 4adf411..6f88026 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -125,6 +125,8 @@ static void test_config_send_receive() { send_cfg->use_compression = true; send_cfg->use_metadata = true; send_cfg->use_fsync = true; + send_cfg->use_delta = true; + send_cfg->whole_file = true; send_cfg->compression_level = 5; send_cfg->chunk_size = 1024; send_cfg->eight_bit_output = true; @@ -165,6 +167,11 @@ static void test_config_send_receive() { if (!recv_cfg->use_fsync) ok = false; if (!recv_cfg->eight_bit_output) + ok = false; + if (recv_cfg->use_delta) + ok = false; + if (!recv_cfg->whole_file) + ok = false; } config_delete(recv_cfg); close(p[0]);