From 2afb1d964931c037495e9456a8a9649935be5537 Mon Sep 17 00:00:00 2001 From: TapTap Date: Thu, 3 Sep 2026 16:54:07 +0200 Subject: [PATCH] feat: add rsync-compatible size-only option --- RSYNC_COMPAT.md | 2 +- src/client/client_cli.c | 1 + src/client/usage.c | 1 + src/server/receiver.c | 2 +- src/server/server.c | 2 +- src/shared/config.c | 13 ++++++++----- src/shared/config.h | 1 + src/shared/file_receive.c | 2 +- tests/integration/test_features.py | 20 ++++++++++++++++++++ tests/test_client_cli.c | 15 +++++++++++++++ tests/test_config.c | 3 +++ 11 files changed, 53 insertions(+), 9 deletions(-) diff --git a/RSYNC_COMPAT.md b/RSYNC_COMPAT.md index 4b236ec..9019bcc 100644 --- a/RSYNC_COMPAT.md +++ b/RSYNC_COMPAT.md @@ -58,7 +58,7 @@ This document maps rsync's full feature set to FastSync's current implementation | `--max-size=SIZE` | Skip files larger than SIZE | ✅ Implemented | `max_size` in scanner | | `--min-size=SIZE` | Skip files smaller than SIZE | ✅ Implemented | `min_size` in scanner | | `-I`, `--ignore-times` | Don't skip files matching size+time | ❌ Not Implemented | | -| `--size-only` | Skip based on size only | ❌ Not Implemented | | +| `--size-only` | Skip based on size only | ✅ Implemented | With `--incremental`, ignores mtime | | `-@`, `--modify-window=NUM` | Mod-time comparison accuracy | ❌ Not Implemented | | | `--existing` | Skip creating new files on receiver | ❌ Not Implemented | | | `--ignore-existing` | Skip updating existing files | ❌ Not Implemented | | diff --git a/src/client/client_cli.c b/src/client/client_cli.c index 191cc07..5f0ac6a 100644 --- a/src/client/client_cli.c +++ b/src/client/client_cli.c @@ -139,6 +139,7 @@ static const OptionEntry OPTION_TABLE[] = { {"--dry-run", "-n", OPT_FLAG, offsetof(Config, dry_run)}, {"--delete", NULL, OPT_FLAG, offsetof(Config, use_delete)}, {"--incremental", NULL, OPT_FLAG, offsetof(Config, use_incremental)}, + {"--size-only", NULL, OPT_FLAG, offsetof(Config, size_only)}, {"--delta", NULL, OPT_FLAG, offsetof(Config, use_delta)}, {"--save-to-disk", NULL, OPT_FLAG, offsetof(Config, save_to_disk)}, {"--progress", NULL, OPT_FLAG, offsetof(Config, show_progress)}, diff --git a/src/client/usage.c b/src/client/usage.c index 2f800af..327c880 100644 --- a/src/client/usage.c +++ b/src/client/usage.c @@ -28,6 +28,7 @@ void print_usage(void) { printf(" --max-size Skip files larger than n bytes\n"); printf(" --min-size Skip files smaller than n bytes\n"); printf(" --incremental Skip files unchanged since last transfer\n"); + printf(" --size-only Skip incremental files matching in size, ignoring mtime\n"); printf(" --delta Delta transfer for changed files (requires --incremental)\n"); printf(" --delta-block Delta block size in bytes (default: %d)\n", DELTA_BLOCK_SIZE_DEFAULT); diff --git a/src/server/receiver.c b/src/server/receiver.c index 2235cf9..2ab898b 100644 --- a/src/server/receiver.c +++ b/src/server/receiver.c @@ -61,7 +61,7 @@ static bool receiver_process_batch(Config* config, int file_descriptor) { struct stat st; bool has_old = file_stat_secure(full_path, &st); bool match = has_old && (unsigned long long)st.st_size == check_size && - (long long)st.st_mtime == check_mtime; + (config->size_only || (long long)st.st_mtime == check_mtime); bool sent = send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT); free(full_path); free(check_path); diff --git a/src/server/server.c b/src/server/server.c index af5cd43..74e8e5d 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -175,7 +175,7 @@ int receive_files(Config* config, int fd) { } bool has_old = full_path && file_stat_secure(full_path, &st); bool match = has_old && (unsigned long long)st.st_size == check_size && - (long long)st.st_mtime == check_mtime; + (config->size_only || (long long)st.st_mtime == check_mtime); bool sent = send_status(fd, match ? STATUS_OK : STATUS_NEXT); free(full_path); free(check_path); diff --git a/src/shared/config.c b/src/shared/config.c index efc2708..1173efb 100644 --- a/src/shared/config.c +++ b/src/shared/config.c @@ -34,6 +34,7 @@ static void config_set_defaults(Config* config) { config->max_size = 0; config->min_size = 0; config->use_incremental = false; + config->size_only = false; config->use_delta = false; config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT; config->delta_max_file_size = DELTA_MAX_FILE_SIZE; @@ -117,10 +118,10 @@ static bool validate_received_config(const Config* config) { valid_wire_bool(config->use_chunk_serialization) && valid_wire_bool(config->use_compression) && valid_wire_bool(config->use_metadata) && valid_wire_bool(config->use_sendfile) && valid_wire_bool(config->use_delete) && - valid_wire_bool(config->use_incremental) && valid_wire_bool(config->use_delta) && - valid_wire_bool(config->backup) && valid_wire_bool(config->follow_symlinks) && - valid_wire_bool(config->copy_links) && valid_wire_bool(config->safe_links) && - valid_wire_bool(config->copy_unsafe_links) && + valid_wire_bool(config->use_incremental) && valid_wire_bool(config->size_only) && + valid_wire_bool(config->use_delta) && valid_wire_bool(config->backup) && + valid_wire_bool(config->follow_symlinks) && valid_wire_bool(config->copy_links) && + valid_wire_bool(config->safe_links) && valid_wire_bool(config->copy_unsafe_links) && valid_wire_bool(config->preserve_hard_links) && valid_wire_bool(config->preserve_acls) && valid_wire_bool(config->preserve_xattrs) && valid_wire_bool(config->preserve_devices) && valid_wire_bool(config->preserve_sparse) && valid_wire_bool(config->update) && @@ -228,7 +229,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->size_only) && send_int(fd, c->use_delta) && 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)); } @@ -281,6 +282,8 @@ static bool receive_delta_fields(int fd, Config* c) { return false; if (!receive_wire_bool(fd, &c->use_incremental)) return false; + if (!receive_wire_bool(fd, &c->size_only)) + return false; if (!receive_wire_bool(fd, &c->use_delta)) return false; return receive_n_data(fd, &c->delta_block_size, sizeof(c->delta_block_size)) && diff --git a/src/shared/config.h b/src/shared/config.h index 4a218b0..eb2ef2e 100644 --- a/src/shared/config.h +++ b/src/shared/config.h @@ -34,6 +34,7 @@ typedef struct Config { unsigned long long max_size; unsigned long long min_size; bool use_incremental; + bool size_only; bool use_delta; uint32_t delta_block_size; unsigned long long delta_max_file_size; diff --git a/src/shared/file_receive.c b/src/shared/file_receive.c index a610d67..2c49525 100644 --- a/src/shared/file_receive.c +++ b/src/shared/file_receive.c @@ -383,7 +383,7 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) { match = (old_size == 0 || old_data) && old_checksum == check_checksum; free(old_data); old_data = NULL; - } else if (match) { + } else if (match && !config->size_only) { match = (long long)st.st_mtime == check_mtime; } diff --git a/tests/integration/test_features.py b/tests/integration/test_features.py index 312add4..574dee5 100644 --- a/tests/integration/test_features.py +++ b/tests/integration/test_features.py @@ -213,6 +213,26 @@ class TestIncremental: with open(received_file, "rb") as f: assert f.read() == b"hello world\n" + def test_size_only_skips_same_size_with_different_mtime(self, shared_server): + clean_dir(DEST_DIR) + result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-M"], port=shared_server.port) + assert result.returncode == 0 + + received = get_dest_received_dir(DEST_DIR, SOURCE_DIR) + received_file = os.path.join(received, "small.txt") + with open(received_file, "wb") as f: + f.write(b"different!!\n") + os.utime(received_file, (time.time() - 3600, time.time() - 3600)) + + result, _ = run_client( + SOURCE_DIR, DEST_DIR, + flags=["-M", "--incremental", "--size-only"], + port=shared_server.port, + ) + assert result.returncode == 0, f"Size-only sync failed: {result.stderr[:200]}" + with open(received_file, "rb") as f: + assert f.read() == b"different!!\n" + 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 656fd40..29d3faa 100644 --- a/tests/test_client_cli.c +++ b/tests/test_client_cli.c @@ -181,6 +181,20 @@ static void test_parse_args_valid_port() { config_delete(cfg); } +/* Test parse_args with --size-only. */ +static void test_parse_args_size_only() { + Config* cfg = config_create(); + char* argv[] = {"fastsync", "--size-only", "/src", "/dst"}; + int positional_args[2]; + int positional_count = 0; + + EXPECT_EQ_INT(parse_args(cfg, 4, argv, positional_args, &positional_count), 0); + EXPECT_TRUE(cfg->size_only); + EXPECT_EQ_INT(positional_count, 2); + + config_delete(cfg); +} + /* Test parse_args rejects port > 65535 */ static void test_parse_args_invalid_port() { Config* cfg = config_create(); @@ -352,6 +366,7 @@ void test_client_cli() { test_parse_args_help(); test_parse_args_version(); test_parse_args_valid_port(); + test_parse_args_size_only(); test_parse_args_invalid_port(); test_parse_args_non_numeric_port(); test_parse_args_invalid_server_port(); diff --git a/tests/test_config.c b/tests/test_config.c index 4f124db..290d980 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -124,6 +124,7 @@ static void test_config_send_receive() { send_cfg->use_chunk_serialization = true; send_cfg->use_compression = true; send_cfg->use_metadata = true; + send_cfg->size_only = true; send_cfg->compression_level = 5; send_cfg->chunk_size = 1024; @@ -160,6 +161,8 @@ static void test_config_send_receive() { ok = false; if (recv_cfg->chunk_size != 1024) ok = false; + if (!recv_cfg->size_only) + ok = false; } config_delete(recv_cfg); close(p[0]);