Merge remote-tracking branch 'origin/feat/ignore-times' into dev

# Conflicts:
#	src/shared/config.c
#	tests/integration/test_features.py
#	tests/test_client_cli.c
#	tests/test_config.c

src/client/client_cli.c

@@ -206,6 +206,7 @@ static const OptionEntry OPTION_TABLE[] = {
     {"--remove-source-files", NULL, OPT_FLAG, offsetof(Config, remove_source_files)},
     {"--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)},
     {"--whole-file", "-W", OPT_FLAG, offsetof(Config, whole_file)},
     {"--save-to-disk", NULL, OPT_FLAG, offsetof(Config, save_to_disk)},

src/client/usage.c

@@ -30,6 +30,7 @@ void print_usage(void) {
   printf("  --max-size <n>      Skip files larger than n bytes\n");
   printf("  --min-size <n>      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("  -W, --whole-file    Transfer changed files without delta processing\n");
   printf("  --delta-block <n>   Delta block size in bytes (default: %d)\n",

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);

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);

src/shared/config.c

@@ -35,6 +35,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->whole_file = false;
   config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT;
@@ -122,9 +123,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) &&
@@ -235,7 +236,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 && !c->whole_file) &&
+         send_int(fd, c->ignore_times) && 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));
 }
@@ -292,6 +293,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)) &&

src/shared/config.h

@@ -35,6 +35,7 @@ typedef struct Config {
   unsigned long long max_size;
   unsigned long long min_size;
   bool use_incremental;
+  bool ignore_times;
   bool use_delta;
   bool whole_file;
   uint32_t delta_block_size;

src/shared/file_receive.c

@@ -378,7 +378,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)
@@ -427,6 +428,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);