Merge remote-tracking branch 'origin/feat/size-only' into dev
# Conflicts: # src/client/client_cli.c # src/client/usage.c # src/server/receiver.c # src/server/server.c # src/shared/config.c # src/shared/config.h # tests/integration/test_features.py # tests/test_config.c
This commit is contained in:
+7
-3
@@ -36,6 +36,7 @@ static void config_set_defaults(Config* config) {
|
||||
config->min_size = 0;
|
||||
config->use_incremental = false;
|
||||
config->ignore_times = false;
|
||||
config->size_only = false;
|
||||
config->use_delta = false;
|
||||
config->whole_file = false;
|
||||
config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT;
|
||||
@@ -122,8 +123,8 @@ 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->ignore_times) && valid_wire_bool(config->backup) &&
|
||||
valid_wire_bool(config->use_incremental) && valid_wire_bool(config->size_only) &&
|
||||
valid_wire_bool(config->ignore_times) && valid_wire_bool(config->use_delta) &&
|
||||
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) &&
|
||||
@@ -236,7 +237,8 @@ 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->ignore_times) && send_int(fd, c->use_delta && !c->whole_file) &&
|
||||
send_int(fd, c->size_only) && 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));
|
||||
}
|
||||
@@ -293,6 +295,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->ignore_times))
|
||||
return false;
|
||||
if (!receive_wire_bool(fd, &c->use_delta))
|
||||
|
||||
Reference in New Issue
Block a user