fix: address all remaining review warnings and style issues
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 7s
CI / build-and-test (push) Successful in 56s
CI / sanitizers (address) (push) Successful in 1m0s
CI / clang-tidy (push) Successful in 6s
CI / build-and-test (pull_request) Successful in 54s
CI / sanitizers (address) (pull_request) Successful in 59s
CI / clang-tidy (pull_request) Successful in 9s
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 7s
CI / build-and-test (push) Successful in 56s
CI / sanitizers (address) (push) Successful in 1m0s
CI / clang-tidy (push) Successful in 6s
CI / build-and-test (pull_request) Successful in 54s
CI / sanitizers (address) (pull_request) Successful in 59s
CI / clang-tidy (pull_request) Successful in 9s
- config.h: bump PROTOCOL_VERSION from "1.2.0" to "1.3.0" (WARNING-1) - client_cli.c: fix realloc leak on exclude/include patterns (WARNING-2) - file.c: document sendfile fallback as safety net only (WARNING-4) - metadata.c: add warning log for utimensat failure (WARNING-5/STYLE-1) - utils.c: fix is_dir_in_manifest false prefix match (WARNING-1) - utils.c: fix double rmdir on recursive collapse, add errno.h (WARNING-2) - client_send.c: guard unchecked send calls for manifest/finished (WARNING-3) - client_send.c: send STATUS_NEXT on rc==2 without delta (WARNING-4)
This commit is contained in:
+1
-1
@@ -42,7 +42,7 @@ typedef struct Config {
|
||||
char* tls_ca;
|
||||
} Config;
|
||||
|
||||
#define PROTOCOL_VERSION "1.2.0"
|
||||
#define PROTOCOL_VERSION "1.3.0"
|
||||
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
||||
|
||||
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
||||
|
||||
@@ -448,6 +448,11 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
|
||||
bool send_path) {
|
||||
// sendfile is incompatible with compression (kernel zero-copy).
|
||||
// If compression is requested, fall back to the regular send path.
|
||||
// NOTE: This is a safety net only — callers must ensure compression_level == 0
|
||||
// before calling file_send_sendfile. The fallback to file_send_single_calls
|
||||
// preserves the send_path contract, but callers should not rely on it for
|
||||
// correctness (the --sendfile flag is validated to be mutually exclusive with
|
||||
// -c/--compress at the CLI layer).
|
||||
if (compression_level > 0)
|
||||
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
||||
send_path);
|
||||
|
||||
@@ -107,5 +107,6 @@ void file_restore_metadata(const char* path, FileMetadata* metadata) {
|
||||
times[0].tv_nsec = UTIME_OMIT;
|
||||
times[1].tv_sec = metadata->mtime_sec;
|
||||
times[1].tv_nsec = metadata->mtime_nsec;
|
||||
utimensat(AT_FDCWD, path, times, 0);
|
||||
if (utimensat(AT_FDCWD, path, times, 0) != 0)
|
||||
log_message(LOG_LEVEL_WARNING, "Failed to set timestamps on %s: %s", path, strerror(errno));
|
||||
}
|
||||
|
||||
+6
-4
@@ -2,6 +2,7 @@
|
||||
#include "array_list.h"
|
||||
#include "libgen.h"
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -86,8 +87,8 @@ static bool is_dir_in_manifest(const char* rel_path, ArrayList* manifest) {
|
||||
size_t len = strlen(rel_path);
|
||||
for (int i = 0; i < manifest->size; i++) {
|
||||
const char* entry = (const char*)manifest->items[i];
|
||||
// Check if entry starts with rel_path + '/'
|
||||
if (strncmp(entry, rel_path, len) == 0 && entry[len] == '/')
|
||||
// Check if entry starts with rel_path + '/' or matches exactly
|
||||
if (strncmp(entry, rel_path, len) == 0 && (entry[len] == '/' || entry[len] == '\0'))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -112,8 +113,9 @@ static void delete_extras_walk(const char* abs_path, const char* rel_path, Array
|
||||
}
|
||||
if (S_ISDIR(st.st_mode)) {
|
||||
delete_extras_walk(child_abs, child_rel, manifest);
|
||||
// After recursion, try to remove the subdirectory if it's now empty
|
||||
if (rmdir(child_abs) != 0) {
|
||||
// After recursion, try to remove the subdirectory if it's now empty.
|
||||
// Ignore ENOENT: the recursive call may have already removed it.
|
||||
if (rmdir(child_abs) != 0 && errno != ENOENT) {
|
||||
all_removed = false;
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user