From 230401c6298cd1f20db45e51ba1e34020b8fe307 Mon Sep 17 00:00:00 2001 From: TapTap Date: Thu, 3 Sep 2026 16:50:07 +0200 Subject: [PATCH 1/3] feat: add ignore-times incremental option --- src/client/client_cli.c | 1 + src/client/usage.c | 1 + src/server/receiver.c | 2 +- src/server/server.c | 3 ++- src/shared/config.c | 11 +++++++---- src/shared/config.h | 1 + tests/integration/test_features.py | 20 ++++++++++++++++++++ tests/test_client_cli.c | 19 +++++++++++++++++++ tests/test_config.c | 3 +++ 9 files changed, 55 insertions(+), 6 deletions(-) diff --git a/src/client/client_cli.c b/src/client/client_cli.c index 191cc07..469795b 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)}, + {"--ignore-times", "-I", OPT_FLAG, offsetof(Config, ignore_times)}, {"--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..a5469ac 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(" -I, --ignore-times Transfer files even when size and mtime match\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..a84cbc3 100644 --- a/src/server/receiver.c +++ b/src/server/receiver.c @@ -60,7 +60,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 && + bool match = !config->ignore_times && has_old && (unsigned long long)st.st_size == check_size && (long long)st.st_mtime == check_mtime; bool sent = send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT); free(full_path); diff --git a/src/server/server.c b/src/server/server.c index af5cd43..ff8b7cb 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -174,7 +174,8 @@ int receive_files(Config* config, int fd) { return -1; } bool has_old = full_path && file_stat_secure(full_path, &st); - bool match = has_old && (unsigned long long)st.st_size == check_size && + bool match = !config->ignore_times && has_old && + (unsigned long long)st.st_size == check_size && (long long)st.st_mtime == check_mtime; bool sent = send_status(fd, match ? STATUS_OK : STATUS_NEXT); free(full_path); diff --git a/src/shared/config.c b/src/shared/config.c index efc2708..b263946 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->ignore_times = false; config->use_delta = false; config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT; config->delta_max_file_size = DELTA_MAX_FILE_SIZE; @@ -118,9 +119,9 @@ static bool validate_received_config(const Config* config) { 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->ignore_times) && 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->ignore_times) && 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->ignore_times)) + 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..64e4afa 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 ignore_times; bool use_delta; uint32_t delta_block_size; unsigned long long delta_max_file_size; diff --git a/tests/integration/test_features.py b/tests/integration/test_features.py index 312add4..dac6549 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_ignore_times_transfers_same_size_and_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) + source_file = os.path.join(SOURCE_DIR, "small.txt") + received_file = os.path.join(received, "small.txt") + source_stat = os.stat(source_file) + with open(received_file, "wb") as f: + f.write(b"stale data\n") + os.utime(received_file, (source_stat.st_atime, source_stat.st_mtime)) + + result, _ = run_client(SOURCE_DIR, DEST_DIR, + flags=["-M", "--incremental", "--ignore-times"], + port=shared_server.port) + assert result.returncode == 0, f"Ignore-times sync failed: {result.stderr[:200]}" + with open(received_file, "rb") as f: + assert f.read() == b"hello world\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..c32bbe1 100644 --- a/tests/test_client_cli.c +++ b/tests/test_client_cli.c @@ -339,6 +339,24 @@ static void test_parse_args_archive() { config_delete(cfg); } +static void test_parse_args_ignore_times() { + Config* cfg = config_create(); + char* argv[] = {"fastsync", "-I", "/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->ignore_times); + config_delete(cfg); + + cfg = config_create(); + char* long_argv[] = {"fastsync", "--ignore-times", "/src", "/dst"}; + positional_count = 0; + EXPECT_EQ_INT(parse_args(cfg, 4, long_argv, positional_args, &positional_count), 0); + EXPECT_TRUE(cfg->ignore_times); + config_delete(cfg); +} + void test_client_cli() { test_validate_config_required_paths(); test_validate_config_incompatible_options(); @@ -360,4 +378,5 @@ void test_client_cli() { test_parse_args_unknown_option(); test_parse_args_rejects_unimplemented_options(); test_parse_args_archive(); + test_parse_args_ignore_times(); } diff --git a/tests/test_config.c b/tests/test_config.c index 4f124db..962bc28 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->ignore_times = true; send_cfg->compression_level = 5; send_cfg->chunk_size = 1024; @@ -156,6 +157,8 @@ static void test_config_send_receive() { ok = false; if (!recv_cfg->use_chunk_serialization) ok = false; + if (!recv_cfg->ignore_times) + ok = false; if (recv_cfg->compression_level != 5) ok = false; if (recv_cfg->chunk_size != 1024) From 1ebe261e05812c34770da4c49cd29664bd893a7e Mon Sep 17 00:00:00 2001 From: TapTap Date: Thu, 3 Sep 2026 21:49:10 +0200 Subject: [PATCH 2/3] fix: complete ignore-times incremental handling --- src/shared/config.h | 2 +- src/shared/file_receive.c | 3 ++- tests/integration/test_features.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/shared/config.h b/src/shared/config.h index 64e4afa..44fbe6d 100644 --- a/src/shared/config.h +++ b/src/shared/config.h @@ -129,7 +129,7 @@ typedef struct Config { char* compress_choice; } Config; -#define PROTOCOL_VERSION "2.2.0" +#define PROTOCOL_VERSION "2.3.0" #define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024) Config* config_create(void); diff --git a/src/shared/file_receive.c b/src/shared/file_receive.c index a610d67..e1e1882 100644 --- a/src/shared/file_receive.c +++ b/src/shared/file_receive.c @@ -375,7 +375,8 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) { close(old_fd); } - bool match = has_old_file && (unsigned long long)st.st_size == check_size; + bool match = + !config->ignore_times && has_old_file && (unsigned long long)st.st_size == check_size; if (match && config->checksum) { uint64_t old_checksum = old_size == 0 ? delta_xxhash64("", 0) : 0; if (old_data) diff --git a/tests/integration/test_features.py b/tests/integration/test_features.py index dac6549..11ccb30 100644 --- a/tests/integration/test_features.py +++ b/tests/integration/test_features.py @@ -223,7 +223,7 @@ class TestIncremental: received_file = os.path.join(received, "small.txt") source_stat = os.stat(source_file) with open(received_file, "wb") as f: - f.write(b"stale data\n") + f.write(b"stale data!\n") os.utime(received_file, (source_stat.st_atime, source_stat.st_mtime)) result, _ = run_client(SOURCE_DIR, DEST_DIR, From 14c5da98d8efdbda7768256618a73255fbfd7232 Mon Sep 17 00:00:00 2001 From: TapTap Date: Thu, 3 Sep 2026 22:51:42 +0200 Subject: [PATCH 3/3] fix: free old snapshot on full transfer fallback --- src/shared/file_receive.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/shared/file_receive.c b/src/shared/file_receive.c index e1e1882..22456d3 100644 --- a/src/shared/file_receive.c +++ b/src/shared/file_receive.c @@ -425,6 +425,8 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) { } if (!try_delta) { + free(old_data); + old_data = NULL; if (!send_status(fd, STATUS_NEXT)) { free(full_path); free(check_path);