TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: apply clang-format across all source files
CI / lint (pull_request) Successful in 1m3s
Details
CI / build-and-test (pull_request) Failing after 10s
Details
CI / fuzz-build (pull_request) Successful in 14s
Details
CI / sanitizers (undefined) (pull_request) Successful in 36s
Details
CI / sanitizers (address) (pull_request) Failing after 38s
Details
CI / valgrind (pull_request) Failing after 9s
Details
CI / coverage (pull_request) Successful in 29s
Details

Browse Source
This commit is contained in:
TapTap
2026-07-29 19:32:13 +02:00
parent 348e72e706
commit 7d8f593844
9 changed files with 80 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/client_cli.c
+18 -9
View File
@@ -311,7 +311,8 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
config->itemize_changes = true;
} else if (strcmp(argv[i], "--out-format") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->out_format);
config->out_format = dup;
} else if (strcmp(argv[i], "--info") == 0 && i + 1 < argc) {
@@ -345,11 +346,13 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
if (!config->filters)
config->filters = array_list_create(free);
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
array_list_add(config->filters, dup);
} else if (strcmp(argv[i], "--files-from") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->files_from);
config->files_from = dup;
} else if (strcmp(argv[i], "--cvs-exclude") == 0) {
@@ -361,7 +364,8 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
} else if (strcmp(argv[i], "-e") == 0 || strcmp(argv[i], "--rsh") == 0) {
if (i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->rsh_command);
config->rsh_command = dup;
} else {
@@ -370,27 +374,32 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
}
} else if (strcmp(argv[i], "--rsync-path") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->rsync_path);
config->rsync_path = dup;
} else if (strcmp(argv[i], "--temp-dir") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->temp_dir);
config->temp_dir = dup;
} else if (strcmp(argv[i], "--compare-dest") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->compare_dest);
config->compare_dest = dup;
} else if (strcmp(argv[i], "--copy-dest") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->copy_dest);
config->copy_dest = dup;
} else if (strcmp(argv[i], "--link-dest") == 0 && i + 1 < argc) {
char* dup = str_dup(argv[++i]);
if (!dup) return -1;
if (!dup)
return -1;
free(config->link_dest);
config->link_dest = dup;
} else if (argv[i][0] == '-') {
src/client/client_send.c
+2 -3
View File
@@ -339,9 +339,8 @@ static int scan_directory_multithreaded(void* pipeline_context) {
context->config->send_directory, context->config->use_metadata, context->config->chunk_size,
context->config->exclude_patterns, context->config->exclude_count,
context->config->include_patterns, context->config->include_count, context->config->max_size,
context->config->min_size, context->config->max_depth, 4,
context->config->follow_symlinks, context->config->copy_links,
context->config->safe_links, context->config->copy_unsafe_links);
context->config->min_size, context->config->max_depth, 4, context->config->follow_symlinks,
context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links);
Chunk* current_chunk;
while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
src/client/scanner.c
+14 -14
View File
@@ -35,12 +35,12 @@ static DirEntry* dir_entry_create(const char* path, int depth) {
}
DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links) {
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links, bool safe_links,
bool copy_unsafe_links) {
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
if (scanner == NULL)
return NULL;
@@ -145,7 +145,8 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
}
is_symlink = S_ISLNK(lstats.st_mode);
if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links && !scanner->copy_unsafe_links) {
if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links &&
!scanner->copy_unsafe_links) {
free(cur_path);
continue;
}
@@ -306,13 +307,12 @@ static int parallel_worker_thread(void* arg) {
}
ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links) {
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads, bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links) {
ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
if (!ps)
return NULL;
src/client/scanner.h
+12 -13
View File
@@ -40,23 +40,22 @@ typedef struct {
} ParallelScanner;
DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links);
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links, bool safe_links,
bool copy_unsafe_links);
Chunk* directory_scanner_next(DirectoryScanner* scanner);
void directory_scanner_destroy(DirectoryScanner* scanner);
ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links);
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads, bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links);
Chunk* parallel_scanner_next(ParallelScanner* scanner);
void parallel_scanner_destroy(ParallelScanner* scanner);