docs: clarify rsync compatibility roadmap

fix: link receiver into fuzz targets
fix: satisfy cppcheck const analysis
2026-08-15 12:49:07 +02:00 · 2026-08-15 12:34:19 +02:00 · 2026-08-15 12:30:52 +02:00 · 2026-08-15 12:27:18 +02:00 · 2026-08-15 11:52:05 +02:00 · 2026-08-11 21:24:37 +02:00
44 changed files with 3076 additions and 2325 deletions
@@ -206,7 +206,7 @@ tea pr close <number> --repo TapTap/FastSync

 ## Common pitfalls

- **`__thread` on shared SSL context**: io_ssl must NOT be thread-local — worker threads inherit the SSL context from the main thread. Use regular `static SSL* io_ssl`.
+- **Per-thread SSL context**: `io_ssl` is stored per-thread (`static __thread SSL* io_ssl`). Each thread that performs protocol I/O must call `io_set_ssl()` to install its own SSL object before using `send_*` / `receive_*` primitives. The main thread's SSL context is not automatically inherited by worker threads.
 - **SSL WANT_READ/WANT_WRITE retry**: Always retry on `SSL_ERROR_WANT_READ` and `SSL_ERROR_WANT_WRITE` in `send_n_data`/`receive_n_data`. Removing these breaks TLS multithreaded transfers.
 - **clang-format version**: The CI image uses clang-format 18. Always format inside the CI Docker container for exact match.
 - **Merge order matters**: Merge the most comprehensive branch first, then smaller ones, to minimize conflicts when creating a combined branch.
@@ -58,15 +58,18 @@ endif()
 find_package(OpenSSL REQUIRED)

 file(GLOB SHARED_SRCS "src/shared/*.c")
+set(FILE_STORE_SRCS src/shared/file_store.c)
+list(REMOVE_ITEM SHARED_SRCS ${FILE_STORE_SRCS})
 file(GLOB SERVER_SRCS "src/server/*.c")
+set(SERVER_RECEIVER_SRCS src/server/receiver.c)
 file(GLOB CLIENT_SRCS "src/client/*.c")

 # --- Main executables ---
-add_executable(server ${SERVER_SRCS} ${SHARED_SRCS})
+add_executable(server ${SERVER_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS})
 target_include_directories(server PRIVATE src/shared src/server src/client)
 target_link_libraries(server PRIVATE Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)

-add_executable(client ${CLIENT_SRCS} ${SHARED_SRCS})
+add_executable(client ${CLIENT_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS})
 target_include_directories(client PRIVATE src/shared src/server src/client)
 target_link_libraries(client PRIVATE Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)

@@ -79,8 +82,9 @@ set(TEST_INCLUDES tests src/shared src/server src/client)

 # Monolithic test binary (backward compatible)
 file(GLOB TEST_SRCS "tests/test_*.c" "tests/runner.c")
-add_executable(tests ${TEST_SRCS} ${SHARED_SRCS} src/client/scanner.c)
+add_executable(tests ${TEST_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS} src/client/scanner.c src/client/client_cli.c src/client/client_validation.c src/client/usage.c)
 target_include_directories(tests PRIVATE ${TEST_INCLUDES})
+target_compile_definitions(tests PRIVATE FASTSYNC_TEST_BUILD)
 target_link_libraries(tests PRIVATE ${TEST_LIBS})
 add_test(NAME unit_all COMMAND tests)

@@ -93,7 +97,7 @@ if(ENABLE_FUZZ)
  file(GLOB FUZZ_SRCS "tests/fuzz/*.c")
 	foreach(FUZZ_SRC ${FUZZ_SRCS})
 		get_filename_component(FUZZ_NAME ${FUZZ_SRC} NAME_WE)
-		add_executable(${FUZZ_NAME} ${FUZZ_SRC} ${SHARED_SRCS})
+    add_executable(${FUZZ_NAME} ${FUZZ_SRC} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS})
 		target_include_directories(${FUZZ_NAME} PRIVATE ${TEST_INCLUDES})
 		target_compile_options(${FUZZ_NAME} PRIVATE -fsanitize=fuzzer,address,undefined -fno-omit-frame-pointer)
 		target_link_options(${FUZZ_NAME} PRIVATE -fsanitize=fuzzer,address,undefined)
@@ -1,371 +1,377 @@
 # FastSync

-A high-performance file synchronization system with SSH and TCP transport, TLS encryption, streaming zstd compression, multithreaded transfer, incremental sync, metadata preservation, and rsync-compatible CLI flags.
+FastSync is a high-performance file synchronization tool designed to become a
+drop-in replacement for common `rsync` workflows. It keeps the familiar
+source/destination model and rsync-style options while adding optional
+multithreading, streaming zstd compression, chunking, zero-copy TCP transfers,
+and native TCP/TLS transports.

-## Technical Overview
+The compatibility target is straightforward:

-1. **Dual transport**: custom TCP client-server or SSH subprocess (rsync-style `user@host:/path`)
-2. **TLS encryption**: OpenSSL-based TLS 1.2+ for encrypted TCP connections with optional CA verification
-3. **Chunked file transfer**: files grouped into configurable-size chunks (default ~10 MB)
-4. **Streaming zstd compression** (levels 1–22) using `ZSTD_compressStream2`
-5. **Multithreading**: producer-consumer pipeline with thread-safe queues (scanner → loader → sender)
-6. **Incremental sync**: skip files unchanged since last transfer (compares size + mtime)
-7. **Batch incremental**: send incremental checks in batched groups for reduced round-trips
-8. **Metadata preservation**: `mode`, `uid`, `gid`, `mtime` restored on disk when enabled
-9. **`sendfile()` zero-copy** on TCP (~2× faster on loopback)
-10. **SSH ControlMaster** for connection reuse across repeated invocations
-11. **Bandwidth limiting**: token-bucket throttling (`--bwlimit`)
-12. **`--delete`**: receiver removes files not present in sender manifest
-13. **`--exclude` / `--include`**: glob-pattern filename filtering
-14. **Path traversal protection**: `..` sequences in file paths are rejected automatically
-15. **Connection limits**: server enforces maximum concurrent connections (default 100)
-16. **Keep-alive**: periodic `STATUS_KEEPALIVE` messages detect stalled connections
-17. **Abort handling**: `SIGINT` sends `STATUS_ABORT` for clean server-side teardown
-18. **Atomic writes**: received files are written to a temporary name then atomically renamed
-19. **Backup mode**: `--backup` preserves overwritten files with optional `--backup-dir`
-20. **Log file**: `--log-file` redirects log output to a file instead of stderr
-21. **Transfer statistics**: `--stats` prints summary of transferred bytes, files, and timing
+- Existing rsync commands should keep the same meaning.
+- FastSync-only performance options should be additive and optional.
+- A normal compatibility-mode transfer should prioritize rsync filesystem
+  semantics over maximum throughput.

-## System Architecture
+FastSync currently speaks its own protocol to `fastsync-server`. SSH mode
+starts that server remotely; it does not yet interoperate with an unmodified
+rsync client or rsync daemon. See [Compatibility Status](#compatibility-status)
+for the current boundary.

-### Client
- Recursively scans source directories (BFS), supports exclude and include patterns
- Groups files into chunks (configurable size)
- Streaming zstd compression with configurable level
- Chunk serialization (compact binary format) or per-file transfer
- Incremental transfer: sends file metadata to server, skips unchanged files
- Batch incremental: groups incremental checks to minimize round-trips
- Manifests all sent paths when `--delete` is active
- Sends via TCP `sendfile()` or SSH pipe
- Optional progress display with throughput
- Bandwidth limiting via token-bucket algorithm
- Configurable I/O and connection timeouts (`--timeout`, `--contimeout`)
- Quiet mode (`-q`/`--quiet`) suppresses all non-error output
- Backup overwritten files (`--backup`) with optional directory (`--backup-dir`)
- Transfer statistics summary (`--stats`)
- Maximum directory depth control (`--max-depth`)
- Log file output (`--log-file`)
- Configurable multithreaded queue size (`--queue-size`)
- Exclude patterns from file (`--exclude-from`)
+## Why FastSync

-### Server
- TCP mode: listens on configurable port (default 8080); SSH mode: runs via `--stdio`
- TLS mode: wraps TCP connections with OpenSSL with optional CA verification
- Receives and reassembles files
- Decompresses (streaming zstd), deserializes, restores metadata
- Handles incremental checks: compares size + mtime against destination files
- Handles batch incremental checks for reduced round-trips
- Processes `STATUS_MANIFEST` for `--delete`: walks destination tree, removes extras
- Per-connection concurrency via `fork()` with configurable connection limit (default 100)
- Thread pool for parallel processing
- Atomic writes: files written to `.tmp` path then atomically renamed on success
- Abort handling: cleanly shuts down on `STATUS_ABORT` from client
- Path traversal protection: rejects file paths containing `..`
+FastSync uses a producer-consumer transfer pipeline and can combine several
+optimizations for large or high-latency transfers:

-## Protocol Details
+- Multithreaded scanning, loading, and sending.
+- Streaming zstd compression with levels 1 through 22.
+- Configurable file chunking and compact chunk serialization.
+- `sendfile()` zero-copy transfers over TCP.
+- Batched incremental checks to reduce round trips.
+- Optional block-level delta transfer for FastSync peers.
+- Bandwidth limiting, progress reporting, statistics, and backups.
+- TCP, SSH, and TLS transports.
+- Atomic temporary-file writes by default.

-### Status Codes
-| Code | Meaning |
-|------|---------|
-| `STATUS_OK` | Operation successful |
-| `STATUS_ERROR` | Error occurred |
-| `STATUS_FINISHED` | Transfer complete |
-| `STATUS_NEXT` | Ready for next file (per-file mode) |
-| `STATUS_CHUNK` | Following data is a serialized chunk |
-| `STATUS_MANIFEST` | Following data is a file manifest (for `--delete`) |
-| `STATUS_CHECK` | Incremental check: client sends file path + size + mtime and, when negotiated, checksum; server responds with OK (skip) or NEXT (send) |
-| `STATUS_CHECK_BATCH` | Batch incremental check: multiple file checks sent in one message |
-| `STATUS_KEEPALIVE` | Keep-alive heartbeat to detect stalled connections |
-| `STATUS_ABORT` | Abort signal: client interrupts, server cleans up and exits |
-| `STATUS_DELTA_SIGNATURE` | Delta sync: following data is a file signature (rsync-style rolling hash) |
-| `STATUS_DELTA_DATA` | Delta sync: following data is a delta patch for a file |
+These optimizations are disabled or selected independently. Users can start
+with rsync-style commands and add FastSync options when they are useful.

-### Wire Format — Metadata
+## Compatibility Status

-When `use_metadata` is enabled (`-M`), each file entry carries a 4-byte `present` flag followed by five fields (`mode`, `uid`, `gid`, `mtime_sec`, `mtime_nsec`). When disabled globally, no metadata bytes are sent — zero wire overhead.
+FastSync is currently an rsync-compatible CLI in progress, not a complete
+replacement for every rsync feature or protocol mode.

-### Transfer Flow
-```
-Config → (STATUS_NEXT | STATUS_CHUNK | STATUS_CHECK | STATUS_CHECK_BATCH)* → [STATUS_MANIFEST] → STATUS_FINISHED → STATUS_OK
-```
+### Working today

-Keep-alive (`STATUS_KEEPALIVE`) may be sent at any point during the transfer. The receiver resets its inactivity timer on receipt. If no data arrives within the receive timeout, the connection is aborted.
+- Recursive directory scanning.
+- Rsync-style source and destination arguments.
+- SSH transport using `user@host:/path` destinations.
+- TCP client/server transfers.
+- Dry runs, excludes, includes, size filters, backups, statistics, and
+  bandwidth limiting.
+- Incremental size/mtime checks and optional xxHash64 content checks.
+- FastSync-native delta transfer for changed files.
+- Optional mode and timestamp preservation.
+- Delete manifests with server-side delete authorization.
+- Temporary-file writes with atomic rename by default.
+- Path traversal checks and destination-root confinement.

-Abort (`STATUS_ABORT`) may be sent at any point. On receipt the server cleans up temporary files and exits the child process.
+### Not yet equivalent to rsync

-### Protocol Version
+- The FastSync wire protocol is not the rsync wire protocol.
+- SSH mode requires `fastsync-server` on the remote host.
+- Archive mode does not yet provide all of rsync's `-rlptgoD` behavior.
+- Symlink transfer is incomplete; link targets are not yet recreated in all
+  modes.
+- Owner/group, ACL, xattr, hard-link, device, and special-file handling is
+  incomplete or unavailable.
+- Sparse-file handling does not yet preserve all holes correctly.
+- `--partial`, `--partial-dir`, `--append`, and `--append-verify` are not yet
+  full rsync-style resumable transfers.
+- Several rsync short options currently have FastSync-specific meanings. Do
+  not assume every short option is interchangeable yet.

-`2.2.0` — server and client must match. This version adds a 64-bit XXH64 checksum to checksum-enabled `STATUS_CHECK` messages and validates the negotiated compression choice (`zstd` or `none`). Older clients and servers must not be mixed with this version; mismatch results in `STATUS_ERROR`.
+The detailed flag matrix is maintained in
+[`RSYNC_COMPAT.md`](RSYNC_COMPAT.md). It distinguishes implemented,
+partial, alternate, and planned behavior.

-Config negotiation is sender-driven: the client serializes transfer options and the server applies them while receiving and writing files. `--checksum` compares size and content checksum instead of timestamps. `--compress-choice zstd` enables zstd; `none` disables it. Unsupported choices are rejected during config exchange.
+## Quick Start

-## Command-Line Arguments
+### Build

-### Client
-
-| Argument | Description |
-|----------|-------------|
-| Positional | `<source> <dest>` — automatic SSH detection if dest contains `:` |
-| `-c [level]` | Compression with optional level (1–22, default 5) |
-| `-z [level]` | Alias for `-c` |
-| `-a, --archive` | Archive mode: enables `-c -m -M` (no `-s`) |
-| `-m` | Multithreading mode |
-| `-s` | Chunk serialization (batch all files per chunk) |
-| `-f, --sendfile` | Sendfile zero-copy. Incompatible with `-c` / `-s`. TCP only. |
-| `-M, --preserve` | Preserve file metadata (mode, uid, gid, mtime) |
-| `-n, --dry-run` | Scan and print what would be transferred |
-| `-p <port>` | SSH port (default: 22) |
-| `-v, --verbose` | Enable debug logging |
-| `-q, --quiet` | Suppress all non-error output |
-| `--silent` | Alias for `--quiet` |
-| `--progress` | Show real-time transfer speed |
-| `--delete` | Delete files on receiver not present in source |
-| `--exclude <pattern>` | Exclude files matching glob pattern (repeatable) |
-| `--exclude-from <file>` | Read exclude patterns from a file (one per line) |
-| `--include <pattern>` | Only transfer files matching glob pattern (repeatable, whitelist) |
-| `--max-size <n>` | Skip files larger than n bytes |
-| `--min-size <n>` | Skip files smaller than n bytes |
-| `--incremental` | Skip files unchanged since last transfer (size + mtime). Auto-enables `--preserve`. Incompatible with `-s`. |
-| `--bwlimit <KB/s>` | Bandwidth limit in kilobytes per second |
-| `--chunk-size <n>` | Chunk size in bytes (default: 10485760) |
-| `--timeout <sec>` | I/O timeout in seconds (default: 30) |
-| `--contimeout <sec>` | Connection timeout in seconds (default: 10) |
-| `--backup` | Backup existing destination files before overwriting |
-| `--backup-dir <dir>` | Target directory for backups (requires `--backup`) |
-| `--stats` | Print transfer statistics at end (bytes, files, timing) |
-| `--max-depth <n>` | Maximum directory depth to recurse (0 = unlimited, default: 0) |
-| `--log-file <path>` | Write log messages to file instead of stderr |
-| `--queue-size <n>` | Queue capacity for multithreaded mode (default: 100) |
-| `--source-dir <path>` | Source directory (overrides `FASTSYNC_SOURCE_DIR`) |
-| `--dest-dir <path>` | Server destination directory (overrides `FASTSYNC_DEST_DIR`) |
-| `--save-to-disk` | Write received files to disk |
-| `--server-host <ip>` | Server IP address (default: `127.0.0.1`) |
-| `--server-port <n>` | Server port (default: `8080`) |
-| `--tls` | Enable TLS encryption |
-| `--cert <path>` | TLS certificate file (PEM) |
-| `--key <path>` | TLS private key file (PEM) |
-| `--ca <path>` | TLS CA certificate file for verification (PEM) |
-
-### Server
-
-| Argument | Description |
-|----------|-------------|
-| `--stdio` | Run in stdio mode (for SSH transport; single connection then exits) |
-| `-p <port>` | TCP listen port (default: 8080, range: 1–65535) |
-| `--tls` | Enable TLS encryption |
-| `--cert <path>` | TLS certificate file (PEM) |
-| `--key <path>` | TLS private key file (PEM) |
-| `--ca <path>` | TLS CA certificate file for verification (PEM) |
-| `-v, --verbose` | Enable debug logging |
-| `--help` | Show help |
-
-## Environment Variables
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `FASTSYNC_SOURCE_DIR` | — | Source directory fallback |
-| `FASTSYNC_DEST_DIR` | — | Destination directory fallback |
-| `FASTSYNC_SAVE_TO_DISK` | `false` | Disk persistence fallback |
-| `FASTSYNC_SSH_PORT` | `22` | Default SSH port |
-| `FASTSYNC_SERVER_HOST` | `127.0.0.1` | Default server host |
-| `FASTSYNC_SERVER_PORT` | `8080` | Default server port |
-| `FASTSYNC_TLS_CERT` | — | Default TLS certificate path |
-| `FASTSYNC_TLS_KEY` | — | Default TLS private key path |
-| `FASTSYNC_TLS_CA` | — | Default TLS CA certificate path |
-
-## Implementation Details
-
-### Data Structures
-1. **Chunk** — collection of files (~10 MB total by default)
-2. **File** — path, content (`Data`), optional `FileMetadata` pointer
-3. **FileMetadata** — `mode`, `uid`, `gid`, `mtime_sec`, `mtime_nsec`
-4. **Config** — runtime parameters (transported over wire, TLS settings excluded). Includes `timeout`, `contimeout`, `quiet`, `backup`, `backup_dir`, `stats`, `max_depth`, `log_file`, `queue_size`.
-5. **Queue** — thread-safe bounded queue with condition variables
-6. **DirectoryScanner** — recursive BFS traversal with exclude and include pattern support, max-depth enforcement
-
-### Key Algorithms
-1. **File scanning** — BFS directory traversal; entries matched against exclude and include patterns, max-depth enforced
-2. **Chunking** — files accumulated until `chunk_size` threshold, then flushed
-3. **Compression** — streaming zstd via `ZSTD_compressStream2` / `ZSTD_decompressStream`
-4. **Network protocol** — status-code-driven exchange with metadata packing, keep-alive, and abort support
-5. **Incremental check** — client sends `STATUS_CHECK` + path + size + mtime and, with `--checksum`, XXH64 content checksum; server compares against destination. Can be batched via `STATUS_CHECK_BATCH` for reduced round-trips.
-6. **Bandwidth limiting** — token-bucket algorithm with `nanosleep` throttling on 64 KB write chunks
-7. **Metadata restoration** — `chmod()`, `chown()`, `utimensat()` on the receiving side
-8. **`--delete`** — sender tracks all sent paths; receiver walks destination tree and removes unlisted files/directories
-9. **SSH transport** — `socketpair()` + `fork()` + `execvp("ssh", ...)` with `ControlMaster` and port support
-10. **TLS transport** — OpenSSL `SSL_CTX` with TLS 1.2 minimum, optional CA verification, transparent `SSL_read`/`SSL_write` via `io_set_ssl()`
-11. **Path traversal protection** — `has_path_traversal()` rejects any file path containing `..` components, preventing directory escape attacks
-12. **Connection limiting** — server tracks active connections and rejects new ones beyond `max_connections` (default 100)
-13. **Keep-alive** — idle connections receive periodic `STATUS_KEEPALIVE` to detect half-open TCP connections
-14. **Abort handling** — `SIGINT` sets an abort flag; the next protocol operation sends `STATUS_ABORT` for clean server cleanup
-15. **Atomic writes** — files are written to a `.tmp` suffix then atomically renamed via `rename()`, preventing partial files
-16. **Backup** — before overwriting, existing files are moved to `--backup-dir` (or same directory with `~` suffix) preserving the original
-
-## Security Features
-
-### Path Traversal Protection
-All received file paths are validated by `has_path_traversal()` before any disk operation. Any path containing `..` components is rejected with `STATUS_ERROR`, preventing directory escape attacks.
-
-### TLS Certificate Verification
-When `--ca` is provided, the server performs mutual TLS verification (`SSL_VERIFY_PEER` with depth 4). Without `--ca`, TLS is still encrypted but peer certificates are not verified.
-
-### Connection Limits
-The server enforces a maximum of 100 concurrent connections (configurable via `max_connections` in `Server`). When the limit is reached, new connections are immediately rejected and closed.
-
-### Abort Handling
-If the client receives `SIGINT` (Ctrl+C) during a transfer, it sends `STATUS_ABORT` to the server. The server then cleans up temporary files and exits the child process, preventing incomplete files from remaining on disk.
-
-### Atomic Writes
-Received files are written to a temporary path (suffixed with `.tmp`) and then atomically renamed to the final filename via `rename()`. This prevents partial or corrupted files from appearing at the destination if the transfer is interrupted.
-
-## Build Requirements
-
- C11 compiler
- CMake >= 3.22
- zstd library
- OpenSSL (development headers and libraries)
- pthreads
- SSH client (for SSH transport mode only)
-
-### Installing Dependencies
-
-**Ubuntu/Debian:**
-```bash
-sudo apt install cmake build-essential libzstd-dev libssl-dev openssh-client
-```
-
-**Nix:**
-```bash
-nix-shell  # provides zstd, openssl, cmake, gcc
-```
-
-## Building
+Requirements: C11 compiler, CMake 3.22 or newer, zstd, OpenSSL, pthreads,
+and an SSH client for SSH transport.

 ```bash
-cmake -B build -S . && cmake --build build -j$(nproc)
+cmake -B build -S .
+cmake --build build -j$(nproc)
 ```

-## Running
+With Nix:

-### Server (TCP mode)
 ```bash
-./build/server
+nix-shell
+cmake -B build -S .
+cmake --build build -j$(nproc)
 ```

-### Server with TLS
+### SSH transfer
+
+The remote host must have `fastsync-server` available in `PATH`, or use
+`--fastsync-server-path`.
+
 ```bash
-./build/server --tls --cert server.pem --key server-key.pem
+./build/client /path/to/source user@host:/path/to/destination
 ```

-### Server via SSH
-Place the `fastsync-server` binary in the remote `$PATH`. The client runs `ssh user@host fastsync-server --stdio` automatically when an SSH-style destination is given.
+### TCP transfer
+
+Start the FastSync server:

-### Client — SSH (rsync-style)
 ```bash
-./build/client /path/to/send user@host:/path/to/receive
+./build/server -p 8080
 ```

-### Client — TCP
+Then run the client:
+
 ```bash
-./build/client --source-dir /path/to/send --dest-dir /path/to/receive --save-to-disk
+./build/client --server-host 127.0.0.1 --server-port 8080 \
+  --source-dir /path/to/source --dest-dir /path/to/destination \
+  --save-to-disk
 ```

-### Client — TCP with TLS
+### TLS transfer
+
 ```bash
+./build/server --tls --cert server.pem --key server-key.pem -p 8443
 ./build/client --tls --cert client.pem --key client-key.pem --ca ca.pem \
-  --source-dir /path/to/send --dest-dir /path/to/receive --save-to-disk
+  --server-host example.com --server-port 8443 \
+  --source-dir /path/to/source --dest-dir /path/to/destination \
+  --save-to-disk
 ```

-### Common Options
+## Common Workflows
+
+These examples show the intended rsync-style workflow. Options marked as
+FastSync-native are optional performance or transport extensions.
+
 ```bash
-# Archive mode (compression + multithreading + metadata)
-./build/client -a /path/to/send user@host:/path
+# Basic synchronization
+./build/client /source/ /destination/

-# Dry run
-./build/client -n /path/to/send /path/to/receive
+# Archive-style synchronization (current FastSync archive behavior)
+./build/client -a /source/ user@host:/destination/

-# With progress and custom chunk size
-./build/client --progress --chunk-size 2097152 /src user@host:/dst
+# Preview a transfer without changing the destination
+./build/client -n /source/ /destination/

-# Exclude temporary files + delete extras on receiver
-./build/client --exclude "*.tmp" --exclude "*.o" --delete /src user@host:/dst
+# Exclude temporary and object files
+./build/client --exclude '*.tmp' --exclude '*.o' \
+  /source/ user@host:/destination/

-# Incremental sync (skip unchanged files)
-./build/client --incremental /src user@host:/dst
+# Remove destination entries not present in the source
+./build/client --delete /source/ user@host:/destination/

-# Bandwidth limit to 1 MB/s
-./build/client --bwlimit 1024 /src user@host:/dst
+# Skip unchanged files using size and modification time
+./build/client --incremental /source/ user@host:/destination/

-# With timeouts, quiet mode, and stats
-./build/client --timeout 60 --contimeout 15 --quiet --stats /src user@host:/dst
+# Verify content when size and time are not sufficient
+./build/client --incremental --checksum /source/ user@host:/destination/

-# Backup overwritten files to a directory
-./build/client --backup --backup-dir /backups /src user@host:/dst
+# Preserve supported mode and timestamp metadata
+./build/client -M /source/ user@host:/destination/

-# Exclude patterns from file, limit depth
-./build/client --exclude-from ignore.txt --max-depth 3 /src user@host:/dst
-
-# Custom queue size for multithreading
-./build/client -m --queue-size 200 /src user@host:/dst
-
-# Log to file
-./build/client --log-file /tmp/fastsync.log /src user@host:/dst
-
-# All features
-./build/client -a --progress --chunk-size 5242880 --exclude "*.log" --delete /src /dst
+# Keep backups of overwritten destination files
+./build/client --backup --backup-dir /backups \
+  /source/ user@host:/destination/
 ```

+## FastSync Extensions
+
+FastSync-native options are intended to add performance or operational
+features without changing the meaning of ordinary compatibility options.
+
+| Option | Purpose |
+|---|---|
+| `-m` | Enable the multithreaded scanner/loader/sender pipeline. |
+| `-c [level]`, `-z [level]` | Enable streaming zstd compression, levels 1-22. |
+| `--compress-level <n>` | Set the zstd compression level. |
+| `--chunk-size <bytes>` | Set the transfer chunk size. |
+| `-s` | Enable FastSync chunk serialization. |
+| `-f`, `--sendfile` | Use TCP `sendfile()` zero-copy transfer. Incompatible with compression and chunk serialization. |
+| `--delta` | Use FastSync-native block delta transfer. Requires `--incremental`. |
+| `--delta-block <bytes>` | Set the FastSync delta block size. |
+| `--delta-max <bytes>` | Limit files eligible for FastSync delta transfer. |
+| `--server-host <host>` | Select the TCP server host. |
+| `--server-port <port>` | Select the TCP server port. |
+| `--tls` | Enable TLS for TCP transport. |
+| `--bwlimit <KB/s>` | Apply token-bucket bandwidth limiting. |
+| `--progress` | Show transfer progress and throughput. |
+| `--stats` | Print transfer statistics. |
+| `--timeout <seconds>` | Set I/O timeout. |
+| `--contimeout <seconds>` | Set connection timeout. |
+
+Current short-option conflicts are tracked as compatibility work. In
+particular, FastSync currently uses `-p` for SSH port, `-s` for chunk
+serialization, and `-S` for sparse handling. These meanings must be reconciled
+before FastSync can claim full rsync CLI compatibility.
+
+## Client Options
+
+### Selection and transfer
+
+| Option | Description |
+|---|---|
+| `-a`, `--archive` | Enable current archive preset. Full rsync archive semantics are planned. |
+| `-n`, `--dry-run` | Scan and report without writing files. |
+| `--delete` | Request removal of destination entries absent from the source. The server must allow deletion. |
+| `--exclude <pattern>` | Exclude matching paths. Repeatable. |
+| `--include <pattern>` | Include matching paths. Repeatable. |
+| `--exclude-from <file>` | Read exclude patterns from a file. |
+| `--include-from <file>` | Read include patterns from a file. |
+| `--max-size <bytes>` | Skip files larger than the limit. |
+| `--min-size <bytes>` | Skip files smaller than the limit. |
+| `--max-depth <n>` | Limit recursive scanning depth; zero means unlimited. |
+| `--incremental` | Skip files matching destination size and mtime. |
+| `--checksum` | Include xxHash64 content checks in incremental comparisons. |
+| `--backup` | Back up overwritten files. |
+| `--backup-dir <dir>` | Store backups under a separate directory. |
+| `--suffix <suffix>` | Set the backup filename suffix. |
+| `--partial` | Keep received data under the configured partial location. Full resume semantics are planned. |
+| `--partial-dir <dir>` | Set the partial transfer directory. |
+| `--inplace` | Write directly to the destination instead of using a temporary file. |
+
+### Metadata and links
+
+| Option | Description |
+|---|---|
+| `-M`, `--preserve` | Preserve supported file metadata, currently mode and modification time. |
+| `-l`, `--links` | Request symlink preservation; link-target transfer remains incomplete. |
+| `--copy-links` | Copy symlink referents. |
+| `--safe-links` | Skip symlinks that point outside the transfer tree. |
+| `--copy-unsafe-links` | Copy unsafe symlink referents. |
+| `-S`, `--sparse` | Request sparse-file handling; full hole preservation is planned. |
+
+### Output and logging
+
+| Option | Description |
+|---|---|
+| `-v`, `--verbose` | Enable debug logging. |
+| `--progress` | Show live transfer progress. |
+| `--stats` | Print transfer statistics. |
+| `--log-file <path>` | Write log output to a file. |
+| `-V`, `--version` | Print the FastSync protocol version. |
+| `--help` | Print command usage. |
+
+### Paths and transport
+
+| Option | Description |
+|---|---|
+| `-p <port>` | SSH port in the current CLI. This conflicts with rsync's `-p` permissions option and is planned for correction. |
+| `--fastsync-server-path <path>` | Remote FastSync server path for SSH mode. |
+| `--source-dir <path>` | Set the source directory explicitly. |
+| `--dest-dir <path>` | Set the destination directory explicitly. |
+| `--save-to-disk` | Enable server-side disk persistence. |
+| `--server-host <host>` | TCP server address. |
+| `--server-port <port>` | TCP server port. |
+| `--tls` | Enable TLS. Requires `--cert` and `--key`. |
+| `--cert <path>` | TLS certificate file. |
+| `--key <path>` | TLS private key file. |
+| `--ca <path>` | CA file for peer verification. |
+
+## Server Options
+
+| Option | Description |
+|---|---|
+| `--stdio` | Serve one SSH connection over standard input/output. |
+| `-p <port>` | TCP listen port. |
+| `--tls` | Enable TLS. |
+| `--cert <path>` | TLS certificate file. |
+| `--key <path>` | TLS private key file. |
+| `--ca <path>` | CA file for peer verification. |
+| `--allow-delete` | Permit client delete manifests. Deletion is refused by default. |
+| `-v`, `--verbose` | Enable debug logging. |
+| `--help` | Print server usage. |
+
+## Architecture
+
+### Client
+
+- Recursively scans the source tree with include, exclude, size, and depth
+  filters.
+- Sends individual files or serialized chunks.
+- Performs incremental checks and optional content checksums.
+- Uses a multithreaded producer-consumer pipeline when requested.
+- Sends over TCP, TLS-wrapped TCP, or an SSH subprocess.
+- Supports progress, statistics, backups, timeouts, and bandwidth limiting.
+
+### Server
+
+- Runs as a TCP listener or one-shot SSH `--stdio` server.
+- Receives and reassembles files and decompresses streaming zstd data.
+- Applies supported metadata and writes files through a confined destination
+  root.
+- Uses temporary files and atomic rename by default.
+- Handles delete manifests only when explicitly authorized.
+- Enforces connection, message-size, and path-safety limits.
+
+## Protocol and Security
+
+FastSync protocol version `2.2.0` is shared by the client and server. The
+current protocol is sender-driven and includes configuration negotiation,
+incremental checks, checksums, manifests, keep-alives, abort handling, and
+FastSync-native delta messages. Client and server versions must currently
+match exactly.
+
+TLS provides encrypted TCP transport. Supplying `--ca` enables certificate
+verification; without it, traffic is encrypted but peer identity is not
+verified. Use certificate verification for deployments where authentication
+matters. The default TCP transport is not encrypted.
+
+The receiver protects its destination root with path validation, `openat()`
+directory traversal, `O_NOFOLLOW`, temporary files, and atomic renames. Delete
+operations require the server's explicit `--allow-delete` policy.
+
+## Compatibility Roadmap
+
+The project will reach the drop-in replacement goal in stages:
+
+1. Correct rsync option meanings, including short options, combined options,
+   and `--option=value` syntax.
+2. Add differential tests that compare FastSync and rsync contents, metadata,
+   links, deletes, filters, dry runs, and exit codes.
+3. Make `-a` implement the expected recursive, links, permissions, times,
+   owner/group, and supported special-file behavior.
+4. Complete symlink, sparse-file, metadata, delete-policy, and resumable-write
+   semantics.
+5. Add rsync remote-shell and daemon protocol interoperability.
+6. Keep FastSync performance options as negotiated, optional extensions.
+
+The exhaustive implementation matrix and compatibility notes are in
+[`RSYNC_COMPAT.md`](RSYNC_COMPAT.md).
+
 ## Testing

-```bash
-# Unit tests (18 suites — array_list, chunk, compression, config, data, delta, file, glob,
-#                      metadata, property, protocol, queue, robustness, scanner,
-#                      shared_utils, stress, transport_tcp, transport_ssh, transport_tls)
-./build/tests
+Run the unit test binary:

-# Integration + benchmark suite
-python3 test.py
+```bash
+./build/tests
 ```

-The benchmark prints throughput metrics, best configuration, and speedup vs rsync.
+Run the Python integration suite:

-## Performance Considerations
+```bash
+python3 -m pytest tests/
+```

-1. Chunk size (~10 MB default) balances memory and transfer efficiency
-2. Compression level trades CPU for bandwidth
-3. `sendfile()` bypasses userspace — ~2× faster on localhost for large files
-4. Multithreading scales with core count; `--queue-size` controls pipeline buffering
-5. Metadata transfer adds negligible overhead (~24 bytes per file when enabled)
-6. SSH socketpair buffer set to 1 MB for improved pipe throughput
-7. SSH ControlMaster reuses connections across repeated invocations
-8. Incremental sync eliminates redundant transfers entirely
-9. Batch incremental reduces round-trips by grouping multiple checks into one message
-10. Bandwidth limiting uses token-bucket with nanosleep for accurate throttling
-11. Atomic writes add a single `rename()` per file — negligible overhead
-12. Path traversal check is O(n) in path length with negligible cost
+For stricter local validation:

-## Benchmark Results
+```bash
+cmake -B build-strict -S . -DSTRICT_WARNINGS=ON
+cmake --build build-strict -j$(nproc)
+cmake -B build-asan -S . -DSANITIZER=address
+cmake --build build-asan -j$(nproc)
+```

-25 MB of mixed file sizes over `localhost` with disk I/O throttled (reads ≤ 15 MB/s, writes ≤ 10 MB/s) and network emulation via `tc netem`. Each test was run 3×; the median is reported below.
+The benchmark tool compares FastSync configurations with rsync under
+controlled local and network conditions:

-### LAN (1000 Mbit, 20 ms ±1 ms, 0.1% loss)
+```bash
+python3 benchmark/bench.py --help
+```

-| Configuration | Time | vs rsync (archive) | vs rsync (compress) |
-|---|---|---|---|
-| **Best: `-m -c`** | **0.20 s** | **11.2× faster** | **3.6× faster** |
-| Compression (`-c`) | 0.31 s | 7.3× faster | 2.3× faster |
-| Standard | 1.27 s | 1.8× faster | — |
-| rsync (archive) | 2.27 s | — | — |
-| rsync (archive + compress) | 0.72 s | — | — |
+Benchmark results measure transfer performance only. They do not establish
+rsync protocol or filesystem-semantic compatibility.

-### WAN (100 Mbit, 50 ms ±10 ms, 1% loss)
+## Performance Guidance

-| Configuration | Time | vs rsync (archive) | vs rsync (compress) |
-|---|---|---|---|
-| **Best: `-m -c`** | **0.39 s** | **44.8× faster** | **3.8× faster** |
-| Compression (`-c`) | 0.64 s | 27.3× faster | 2.3× faster |
-| Standard | 7.12 s | 2.4× faster | — |
-| rsync (archive) | 17.44 s | — | — |
-| rsync (archive + compress) | 1.47 s | — | — |
+- Use `-m` for workloads with many files or enough CPU parallelism.
+- Use `-c` or `-z` when network bandwidth is more constrained than CPU.
+- Tune `--chunk-size` for file sizes, memory limits, and network latency.
+- Use `-f` for large uncompressed TCP transfers where zero-copy I/O helps.
+- Use `--incremental` to avoid retransmitting unchanged files.
+- Use `--delta` for changed files when both endpoints are FastSync peers.
+- Use `--bwlimit` when sharing a link with other traffic.

-Compression reduces the data on the wire enough that the transfer becomes latency-bound rather than bandwidth-bound. On WAN, the best configuration runs 10.8× faster than the theoretical limit for uncompressed data, since zstd shrinks the 25 MB payload to a fraction of its original size over the wire.
+Always validate the compatibility behavior required by a deployment before
+replacing an existing rsync job.
@@ -6,10 +6,10 @@ This document maps rsync's full feature set to FastSync's current implementation

 | Status | Count | Description |
 |--------|-------|-------------|
-| ✅ Implemented | 39 | Feature works end-to-end |
-| 🔀 Alt Arg | 5 | Functionality exists but under different flag/semantics |
-| ⚠️ Partial | 30 | Flag parsed/stored but behavior incomplete |
-| ❌ Not Implemented | 62 | Flag not recognized or no behavior |
+| ✅ Implemented | 34 | Feature works end-to-end |
+| 🔀 Alt Arg | 3 | Functionality exists but under different flag/semantics |
+| ⚠️ Partial | 1 | Flag parsed/stored but behavior incomplete |
+| ❌ Not Implemented | 98 | Flag not recognized or no behavior |
 | **Total** | **136** | |

 ---
@@ -20,31 +20,31 @@ This document maps rsync's full feature set to FastSync's current implementation
 |------|-------------------|-----------------|-------|
 | `-a`, `--archive` | Archive mode is -rlptgoD | 🔀 Alt Arg | Maps to -c -m -M (compression + multithread + metadata) |
 | `-v`, `--verbose` | Increase verbosity | ✅ Implemented | Sets `log_level=DEBUG` |
-| `-q`, `--quiet` | Suppress non-error messages | ✅ Implemented | `quiet` config field |
-| `-h`, `--help` | Show help | ✅ Implemented | Prints usage and exits |
-| `-V`, `--version` | Print version | ❌ Not Implemented | |
-| `--info=FLAGS` | Fine-grained info verbosity | ⚠️ Partial | `info_level` stored, not wired |
-| `--debug=FLAGS` | Fine-grained debug verbosity | ⚠️ Partial | `debug_level` stored, not wired |
+| `-q`, `--quiet` | Suppress non-error messages | ❌ Not Implemented | Removed because it had no effect |
+| `--help` | Show help | ✅ Implemented | Prints usage and exits; `-h` is not accepted |
+| `-V`, `--version` | Print version | ✅ Implemented | |
+| `--info=FLAGS` | Fine-grained info verbosity | ❌ Not Implemented | Removed because it had no effect |
+| `--debug=FLAGS` | Fine-grained debug verbosity | ❌ Not Implemented | Removed because it had no effect |
 | `--stderr=MODE` | Change stderr output mode | ❌ Not Implemented | |
 | `--no-motd` | Suppress daemon MOTD | ❌ Not Implemented | |
 | `--exclude=PATTERN` | Exclude files matching pattern | ✅ Implemented | Glob matching in scanner |
 | `--include=PATTERN` | Include files matching pattern | ✅ Implemented | Glob matching in scanner |
-| `-C`, `--cvs-exclude` | Auto-ignore CVS files | ⚠️ Partial | `cvs_exclude` stored, not wired |
+| `-C`, `--cvs-exclude` | Auto-ignore CVS files | ❌ Not Implemented | Removed because it had no effect |

 ## 2. Modifying Output

 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
 | `--stats` | Give transfer stats | ✅ Implemented | Prints file/byte counts |
-| `-h`, `--human-readable` | Human-readable numbers | ⚠️ Partial | `human_readable` stored, not wired |
-| `-i`, `--itemize-changes` | Per-file change summary | ⚠️ Partial | `itemize_changes` stored, not wired |
+| `-h`, `--human-readable` | Human-readable numbers | ❌ Not Implemented | Removed because it had no effect |
+| `-i`, `--itemize-changes` | Per-file change summary | ❌ Not Implemented | Removed because it had no effect |
 | `--progress` | Show progress | ✅ Implemented | Progress callback in sender |
 | `-P` | Same as --partial --progress | ❌ Not Implemented | |
-| `--out-format=FORMAT` | Custom output format | ⚠️ Partial | `out_format` stored, not wired |
+| `--out-format=FORMAT` | Custom output format | ❌ Not Implemented | Removed because it had no effect |
 | `--log-file=FILE` | Log to file | ✅ Implemented | `log_file` config field |
 | `--log-file-format=FMT` | Log format | ❌ Not Implemented | |
 | `--8-bit-output` | Leave high-bit chars unescaped | ❌ Not Implemented | |
-| `--list-only` | List files instead of copying | ⚠️ Partial | `list_only` stored, not wired |
+| `--list-only` | List files instead of copying | ❌ Not Implemented | Removed because it had no effect |

 ## 3. File Selection

@@ -52,8 +52,8 @@ This document maps rsync's full feature set to FastSync's current implementation
 |------|-------------------|-----------------|-------|
 | `--exclude-from=FILE` | Read exclude patterns from file | ✅ Implemented | Reads patterns from file |
 | `--include-from=FILE` | Read include patterns from file | ✅ Implemented | Reads patterns from file |
-| `--filter=RULE` | Add file-filtering rule | ⚠️ Partial | `filters` ArrayList stored, not wired |
-| `--files-from=FILE` | Read source file list from file | ⚠️ Partial | `files_from` stored, not wired |
+| `--filter=RULE` | Add file-filtering rule | ❌ Not Implemented | Removed because it had no effect |
+| `--files-from=FILE` | Read source file list from file | ❌ Not Implemented | Removed because it had no effect |
 | `-0`, `--from0` | Delimit *-from files with NULs | ❌ Not Implemented | |
 | `--max-size=SIZE` | Skip files larger than SIZE | ✅ Implemented | `max_size` in scanner |
 | `--min-size=SIZE` | Skip files smaller than SIZE | ✅ Implemented | `min_size` in scanner |
@@ -69,7 +69,7 @@ This document maps rsync's full feature set to FastSync's current implementation
 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
 | `-r`, `--recursive` | Recurse into directories | ✅ Implemented | Default behavior |
-| `-R`, `--relative` | Use relative path names | ⚠️ Partial | `relative` stored, not wired |
+| `-R`, `--relative` | Use relative path names | ❌ Not Implemented | Removed because it had no effect |
 | `--no-implied-dirs` | Don't send implied dirs with -R | ❌ Not Implemented | |
 | `-d`, `--dirs` | Transfer dirs without recursing | ❌ Not Implemented | |
 | `--mkpath` | Create missing path components | ❌ Not Implemented | |
@@ -78,10 +78,10 @@ This document maps rsync's full feature set to FastSync's current implementation

 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
-| `-u`, `--update` | Skip files newer on receiver | ⚠️ Partial | `update` stored, not wired |
+| `-u`, `--update` | Skip files newer on receiver | ❌ Not Implemented | Removed because it had no effect |
 | `--inplace` | Update files in-place | ✅ Implemented | Direct write mode |
-| `--append` | Append data to shorter files | ⚠️ Partial | `append` stored, not wired |
-| `--append-verify` | Append with old-data checksum | ⚠️ Partial | `append_verify` stored, not wired |
+| `--append` | Append data to shorter files | ❌ Not Implemented | Removed because it had no effect |
+| `--append-verify` | Append with old-data checksum | ❌ Not Implemented | Removed because it had no effect |
 | `-W`, `--whole-file` | Copy whole file (no delta) | ❌ Not Implemented | |
 | `--block-size=SIZE` | Force checksum block-size | ⚠️ Partial | Parsed as `--delta-block`; controls delta transfer block size |

@@ -100,15 +100,15 @@ This document maps rsync's full feature set to FastSync's current implementation
 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
 | `--delete` | Delete extraneous files from dest | ✅ Implemented | `use_delete` config field |
-| `--delete-before` | Delete before transfer | ⚠️ Partial | `delete_before` stored, not wired |
+| `--delete-before` | Delete before transfer | ❌ Not Implemented | Removed because it had no effect |
 | `--delete-during` | Delete during transfer | ❌ Not Implemented | |
 | `--delete-delay` | Find deletions during, delete after | ❌ Not Implemented | |
-| `--delete-after` | Delete after transfer | ⚠️ Partial | `delete_after` stored, not wired |
-| `--delete-excluded` | Also delete excluded files | ⚠️ Partial | `delete_excluded` stored, not wired |
-| `--max-delete=NUM` | Max files to delete | ⚠️ Partial | `max_delete` stored, not wired |
+| `--delete-after` | Delete after transfer | ❌ Not Implemented | Removed because it had no effect |
+| `--delete-excluded` | Also delete excluded files | ❌ Not Implemented | Removed because it had no effect |
+| `--max-delete=NUM` | Max files to delete | ❌ Not Implemented | Removed because it had no effect |
 | `--ignore-errors` | Delete even with I/O errors | ❌ Not Implemented | |
 | `--force` | Force deletion of non-empty dirs | ❌ Not Implemented | |
-| `--prune-empty-dirs` | Prune empty dir chains | ⚠️ Partial | `prune_empty_dirs` stored, not wired |
+| `--prune-empty-dirs` | Prune empty dir chains | ❌ Not Implemented | Removed because it had no effect |

 ## 8. Metadata Preservation

@@ -121,11 +121,11 @@ This document maps rsync's full feature set to FastSync's current implementation
 | `-t`, `--times` | Preserve modification times | ✅ Implemented | Part of -M |
 | `-E`, `--executability` | Preserve executability | ❌ Not Implemented | |
 | `--chmod=CHMOD` | Affect file permissions | ❌ Not Implemented | |
-| `-A`, `--acls` | Preserve ACLs | ⚠️ Partial | `preserve_acls` stored, not wired |
-| `-X`, `--xattrs` | Preserve extended attributes | ⚠️ Partial | `preserve_xattrs` stored, not wired |
-| `-H`, `--hard-links` | Preserve hard links | ⚠️ Partial | `preserve_hard_links` stored, not wired |
-| `-D` | Same as --devices --specials | 🔀 Alt Arg | Maps to --devices only (no --specials) |
-| `--devices` | Preserve device files | ⚠️ Partial | `preserve_devices` stored, not wired |
+| `-A`, `--acls` | Preserve ACLs | ❌ Not Implemented | Removed because it had no effect |
+| `-X`, `--xattrs` | Preserve extended attributes | ❌ Not Implemented | Removed because it had no effect |
+| `-H`, `--hard-links` | Preserve hard links | ❌ Not Implemented | Removed because it had no effect |
+| `-D` | Same as --devices --specials | ❌ Not Implemented | Removed because device-file handling is not implemented |
+| `--devices` | Preserve device files | ❌ Not Implemented | Removed because it had no effect |
 | `--specials` | Preserve special files | ❌ Not Implemented | |
 | `--copy-devices` | Copy device contents as file | ❌ Not Implemented | |
 | `--write-devices` | Write to devices as files | ❌ Not Implemented | |
@@ -159,11 +159,11 @@ This document maps rsync's full feature set to FastSync's current implementation

 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
-| `-c`, `--checksum` | Skip based on checksum | 🔀 Alt Arg | `-c` means compression; `--checksum` stored and forwarded to scanner |
+| `--checksum` | Skip based on checksum | ❌ Not Implemented | Removed because it had no effect; `-c` means compression |
 | `--checksum-choice=STR` | Choose checksum algorithm | ❌ Not Implemented | xxHash used internally |
-| `--compare-dest=DIR` | Compare dest files relative to DIR | ⚠️ Partial | `compare_dest` stored, not wired |
-| `--copy-dest=DIR` | Include copies of unchanged files | ⚠️ Partial | `copy_dest` stored, not wired |
-| `--link-dest=DIR` | Hardlink to files when unchanged | ⚠️ Partial | `link_dest` stored, not wired |
+| `--compare-dest=DIR` | Compare dest files relative to DIR | ❌ Not Implemented | Removed because it had no effect |
+| `--copy-dest=DIR` | Include copies of unchanged files | ❌ Not Implemented | Removed because it had no effect |
+| `--link-dest=DIR` | Hardlink to files when unchanged | ❌ Not Implemented | Removed because it had no effect |
 | `--fuzzy`, `--no-fuzzy` | Find similar file for basis | ❌ Not Implemented | |

 ## 12. Compression
@@ -171,7 +171,7 @@ This document maps rsync's full feature set to FastSync's current implementation
 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
 | `-z`, `--compress` | Compress file data | 🔀 Alt Arg | Always uses zstd (rsync supports multiple algorithms) |
-| `--compress-choice=STR` | Choose compression algorithm | ⚠️ Partial | `compress_choice` stored, always zstd |
+| `--compress-choice=STR` | Choose compression algorithm | ❌ Not Implemented | Removed because it had no effect; FastSync always uses zstd |
 | `--compress-level=NUM` | Set compression level | ✅ Implemented | 1-22, default 5 |
 | `--compress-threads=NUM` | Set compression threads | ❌ Not Implemented | |
 | `--skip-compress=LIST` | Skip compress for suffixes | ❌ Not Implemented | Internal skip for hardcoded types; not user-configurable |
@@ -180,22 +180,22 @@ This document maps rsync's full feature set to FastSync's current implementation

 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
-| `-e`, `--rsh=COMMAND` | Remote shell to use | ✅ Implemented | SSH transport support |
-| `--rsync-path=PROGRAM` | rsync binary on remote | ✅ Implemented | `rsync_path` config field |
+| `-e`, `--rsh=COMMAND` | Remote shell to use | ❌ Not Implemented | Removed; SSH invokes `ssh` directly |
+| `--rsync-path=PROGRAM` | rsync binary on remote | ❌ Not Implemented | Removed; use `--fastsync-server-path` |
 | `--port=PORT` | Alternate daemon port | ✅ Implemented | `server_port` config field |
 | `--sockopts=OPTIONS` | Custom TCP options | ❌ Not Implemented | |
 | `--blocking-io` | Use blocking I/O for remote shell | ❌ Not Implemented | |
 | `--outbuf=N\|L\|B` | Set output buffering | ❌ Not Implemented | |
-| `--address=ADDRESS` | Bind address for outgoing socket | ✅ Implemented | `address` config field |
-| `-4`, `--ipv4` | Prefer IPv4 | ✅ Implemented | `ipv4` config field |
-| `-6`, `--ipv6` | Prefer IPv6 | ✅ Implemented | `ipv6` config field |
+| `--address=ADDRESS` | Bind address for outgoing socket | ❌ Not Implemented | Removed because it had no effect |
+| `-4`, `--ipv4` | Prefer IPv4 | ❌ Not Implemented | Removed because it had no effect |
+| `-6`, `--ipv6` | Prefer IPv6 | ❌ Not Implemented | Removed because it had no effect |

 ## 14. Daemon Mode

 | Flag | Rsync Description | FastSync Status | Notes |
 |------|-------------------|-----------------|-------|
-| `--daemon` | Run as rsync daemon | ⚠️ Partial | `daemon` stored, not wired |
-| `--config=FILE` | Alternate rsyncd.conf file | ⚠️ Partial | `daemon_config` stored, not wired |
+| `--daemon` | Run as rsync daemon | ❌ Not Implemented | Removed because it had no effect |
+| `--config=FILE` | Alternate rsyncd.conf file | ❌ Not Implemented | Removed because it had no effect |
 | `--dparam=OVERRIDE` | Override global daemon config | ❌ Not Implemented | |
 | `--no-detach` | Don't detach from parent | ❌ Not Implemented | |
 | `--password-file=FILE` | Read daemon password from file | ❌ Not Implemented | |
@@ -266,7 +266,6 @@ Ranked by user demand, implementation complexity, and interoperability impact:
 | `-f` / `--sendfile` | Zero-copy sendfile() syscall (TCP only) |
 | `-c [level]` | zstd compression level (1-22) |
 | `--chunk-size` | Configurable chunk size |
-| `--queue-size` | Pipeline queue capacity |
 | `--tls` | TLS encryption (mutual auth) |
 | `--fastsync-server-path` | Path to fastsync-server binary |
 | `--server-host` / `--server-port` | Direct TCP connection |
@@ -1,17 +1,21 @@
 #include "client_send.h"
+#include "client_validation.h"
 #include "config.h"
 #include "delta.h"
 #include "log.h"
 #include "protocol.h"
 #include "transport_tcp.h"
 #include "transport_tls.h"
+#include "usage.h"
 #include "utils.h"
 #include <errno.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#ifndef FASTSYNC_TEST_BUILD
 /* Parse environment variables for source/destination directories and save-to-disk flag. */
 static void parse_environment(const char** out_env_source, const char** out_env_dest,
                              bool* out_save_to_disk) {
@@ -22,19 +26,7 @@ static void parse_environment(const char** out_env_source, const char** out_env_
  if (env_save && (strcmp(env_save, "true") == 0 || strcmp(env_save, "1") == 0))
    *out_save_to_disk = true;
 }
-
-/* Parse a string as a positive integer, returning true on success. */
-static bool parse_positive_int(const char* s, int* out_val) {
-  if (!s || *s == '\0')
-    return false;
-  char* endptr;
-  errno = 0;
-  long val = strtol(s, &endptr, 10);
-  if (errno != 0 || *endptr != '\0' || val <= 0 || val > INT_MAX)
-    return false;
-  *out_val = (int)val;
-  return true;
-}
+#endif

 /* Parse a string as a non-negative integer, returning true on success. */
 static bool parse_nonneg_int(const char* s, int* out_val) {
@@ -49,16 +41,62 @@ static bool parse_nonneg_int(const char* s, int* out_val) {
  return true;
 }

-static void print_usage(void);
+/* Parse a string as a positive integer, returning true on success. */
+static bool parse_positive_int(const char* s, int* out_val) {
+  int temp;
+  if (!parse_nonneg_int(s, &temp)) {
+    return false;
+  }
+  if (temp == 0) {
+    return false;
+  }
+  *out_val = temp;
+  return true;
+}
+
+/* Duplicate a string argument into *dest, freeing the old value. Returns true on success, false on
+ * failure. */
+static int set_string_option(char** dest, const char* value, const char* option_name) {
+  char* dup = str_dup(value);
+  if (!dup) {
+    fprintf(stderr, "Error: memory allocation failed for %s\n", option_name);
+    return -1;
+  }
+  free(*dest);
+  *dest = dup;
+  return 0;
+}
+
+/* Parse a string as a positive integer into *dest. Returns true on success, false on error. */
+static int set_positive_int_option(int* dest, const char* value, const char* option_name) {
+  if (!parse_positive_int(value, dest)) {
+    fprintf(stderr, "Error: %s must be a positive integer\n", option_name);
+    return -1;
+  }
+  return 0;
+}
+
+/* Parse a string as a non-negative integer into *dest. Returns true on success, false on error. */
+static int set_nonneg_int_option(int* dest, const char* value, const char* option_name) {
+  if (!parse_nonneg_int(value, dest)) {
+    fprintf(stderr, "Error: %s must be a non-negative integer\n", option_name);
+    return -1;
+  }
+  return 0;
+}
+
 static int read_patterns_from_file(const char* filepath, char*** patterns, int* count);

 /* Parse CLI arguments into config. Returns 0 on success, -1 on error, 1 for help/clean-exit. */
-static int parse_args(Config* config, int argc, char* argv[], int* positional_args,
-                      int* positional_count) {
+int parse_args(Config* config, int argc, char* argv[], int* positional_args,
+               int* positional_count) {
  for (int i = 1; i < argc; i++) {
    if (strcmp(argv[i], "--help") == 0) {
      print_usage();
      return 1;
+    } else if (strcmp(argv[i], "-V") == 0 || strcmp(argv[i], "--version") == 0) {
+      printf("fastsync version %s\n", PROTOCOL_VERSION);
+      return 1;
    } else if (strcmp(argv[i], "-a") == 0 || strcmp(argv[i], "--archive") == 0) {
      config->use_compression = true;
      config->use_multithreading = true;
@@ -67,8 +105,10 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
    } else if (strcmp(argv[i], "-n") == 0 || strcmp(argv[i], "--dry-run") == 0) {
      config->dry_run = true;
    } else if (strcmp(argv[i], "-p") == 0 && i + 1 < argc) {
-      if (!parse_positive_int(argv[++i], &config->ssh_port)) {
-        fprintf(stderr, "Error: invalid --port/-p value: %s\n", argv[i]);
+      if (set_positive_int_option(&config->ssh_port, argv[++i], "-p") != 0)
+        return -1;
+      if (config->ssh_port > 65535) {
+        log_message(LOG_LEVEL_ERROR, "SSH port must be 1-65535\n");
        return -1;
      }
    } else if (strcmp(argv[i], "--delete") == 0) {
@@ -100,21 +140,47 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
      }
      config->include_patterns[config->include_count++] = dup;
    } else if (strcmp(argv[i], "--max-size") == 0 && i + 1 < argc) {
-      config->max_size = strtoull(argv[++i], NULL, 10);
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --max-size must be a non-negative integer\n");
+        return -1;
+      }
+      config->max_size = val;
    } else if (strcmp(argv[i], "--min-size") == 0 && i + 1 < argc) {
-      config->min_size = strtoull(argv[++i], NULL, 10);
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --min-size must be a non-negative integer\n");
+        return -1;
+      }
+      config->min_size = val;
    } else if (strcmp(argv[i], "--incremental") == 0) {
      config->use_incremental = true;
    } else if (strcmp(argv[i], "--delta") == 0) {
      config->use_delta = true;
    } else if (strcmp(argv[i], "--delta-block") == 0 && i + 1 < argc) {
-      unsigned long long val = strtoull(argv[++i], NULL, 10);
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --delta-block must be a positive integer\n");
+        return -1;
+      }
      if (val >= DELTA_BLOCK_SIZE_MIN && val <= DELTA_BLOCK_SIZE_MAX)
        config->delta_block_size = (uint32_t)val;
      else
        fprintf(stderr, "Warning: --delta-block value %llu out of range, using default\n", val);
    } else if (strcmp(argv[i], "--delta-max") == 0 && i + 1 < argc) {
-      unsigned long long val = strtoull(argv[++i], NULL, 10);
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --delta-max must be a positive integer\n");
+        return -1;
+      }
      if (val >= DELTA_MIN_FILE_SIZE)
        config->delta_max_file_size = val;
      else
@@ -126,27 +192,21 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
        char* end_ptr;
        long level = strtol(argv[i + 1], &end_ptr, 10);
        if (*end_ptr == '\0') {
+          if (level < 1 || level > 22) {
+            fprintf(stderr, "Error: compression level must be 1-22\n");
+            return -1;
+          }
          config->compression_level = (int)level;
          log_message(LOG_LEVEL_INFO, "Set Compression level to %ld", level);
          i++;
        }
      }
    } else if (strcmp(argv[i], "--source-dir") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --source-dir\n");
+      if (set_string_option(&config->send_directory, argv[++i], "--source-dir") != 0)
        return -1;
-      }
-      free(config->send_directory);
-      config->send_directory = dup;
    } else if (strcmp(argv[i], "--dest-dir") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --dest-dir\n");
+      if (set_string_option(&config->receive_root_directory, argv[++i], "--dest-dir") != 0)
        return -1;
-      }
-      free(config->receive_root_directory);
-      config->receive_root_directory = dup;
    } else if (strcmp(argv[i], "--save-to-disk") == 0) {
      config->save_to_disk = true;
    } else if (strcmp(argv[i], "-M") == 0 || strcmp(argv[i], "--preserve") == 0) {
@@ -162,18 +222,17 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
      config->use_chunk_serialization = true;
      log_message(LOG_LEVEL_INFO, "Enabled Chunk Serialization");
    } else if (strcmp(argv[i], "--server-host") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --server-host\n");
+      if (set_string_option(&config->server_host, argv[++i], "--server-host") != 0)
        return -1;
-      }
-      free(config->server_host);
-      config->server_host = dup;
    } else if (strcmp(argv[i], "--server-port") == 0 && i + 1 < argc) {
      if (!parse_positive_int(argv[++i], &config->server_port)) {
        fprintf(stderr, "Error: invalid --server-port value: %s\n", argv[i]);
        return -1;
      }
+      if (config->server_port > 65535) {
+        fprintf(stderr, "Error: server port must be 1-65535\n");
+        return -1;
+      }
    } else if (strcmp(argv[i], "--bwlimit") == 0 && i + 1 < argc) {
      char* end;
      errno = 0;
@@ -191,70 +250,47 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
    } else if (strcmp(argv[i], "--progress") == 0) {
      config->show_progress = true;
    } else if (strcmp(argv[i], "--chunk-size") == 0 && i + 1 < argc) {
-      unsigned long long val = strtoull(argv[++i], NULL, 10);
-      if (val > 0)
-        config->chunk_size = val;
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0' || val == 0) {
+        fprintf(stderr, "Error: --chunk-size must be a positive integer\n");
+        return -1;
+      }
+      config->chunk_size = val;
    } else if (strcmp(argv[i], "--tls") == 0) {
      config->use_tls = true;
    } else if (strcmp(argv[i], "--cert") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --cert\n");
+      if (set_string_option(&config->tls_cert, argv[++i], "--cert") != 0)
        return -1;
-      }
-      free(config->tls_cert);
-      config->tls_cert = dup;
    } else if (strcmp(argv[i], "--key") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --key\n");
+      if (set_string_option(&config->tls_key, argv[++i], "--key") != 0)
        return -1;
-      }
-      free(config->tls_key);
-      config->tls_key = dup;
    } else if (strcmp(argv[i], "--ca") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --ca\n");
+      if (set_string_option(&config->tls_ca, argv[++i], "--ca") != 0)
        return -1;
-      }
-      free(config->tls_ca);
-      config->tls_ca = dup;
    } else if (strcmp(argv[i], "--timeout") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_positive_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: --timeout must be a positive integer\n");
+      if (set_positive_int_option(&config->timeout, argv[++i], "--timeout") != 0)
        return -1;
-      }
-      config->timeout = val;
    } else if (strcmp(argv[i], "--contimeout") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_positive_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: --contimeout must be a positive integer\n");
+      if (set_positive_int_option(&config->contimeout, argv[++i], "--contimeout") != 0)
        return -1;
-      }
-      config->contimeout = val;
-    } else if (strcmp(argv[i], "-q") == 0 || strcmp(argv[i], "--quiet") == 0 ||
-               strcmp(argv[i], "--silent") == 0) {
-      config->quiet = true;
    } else if (strcmp(argv[i], "--backup") == 0) {
      config->backup = true;
    } else if (strcmp(argv[i], "--backup-dir") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --backup-dir\n");
+      if (set_string_option(&config->backup_dir, argv[++i], "--backup-dir") != 0)
        return -1;
-      }
-      free(config->backup_dir);
-      config->backup_dir = dup;
    } else if (strcmp(argv[i], "--stats") == 0) {
      config->stats = true;
    } else if (strcmp(argv[i], "--max-depth") == 0 && i + 1 < argc) {
-      if (!parse_nonneg_int(argv[++i], &config->max_depth)) {
-        fprintf(stderr, "Error: --max-depth must be a non-negative integer\n");
+      if (set_nonneg_int_option(&config->max_depth, argv[++i], "--max-depth") != 0)
        return -1;
-      }
    } else if (strcmp(argv[i], "--log-file") == 0 && i + 1 < argc) {
+      if (config->log_file) {
+        fclose(config->log_file);
+        config->log_file = NULL;
+        log_set_file(NULL);
+      }
      FILE* lf = fopen(argv[++i], "a");
      if (!lf) {
        fprintf(stderr, "Error: could not open log file '%s': %s\n", argv[i], strerror(errno));
@@ -262,13 +298,6 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
      }
      config->log_file = lf;
      log_set_file(lf);
-    } else if (strcmp(argv[i], "--queue-size") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_positive_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: --queue-size must be a positive integer\n");
-        return -1;
-      }
-      config->queue_size = val;
    } else if (strcmp(argv[i], "--exclude-from") == 0 && i + 1 < argc) {
      if (read_patterns_from_file(argv[++i], &config->exclude_patterns, &config->exclude_count) !=
          0)
@@ -280,13 +309,9 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
    } else if (strcmp(argv[i], "--partial") == 0) {
      config->partial = true;
    } else if (strcmp(argv[i], "--fastsync-server-path") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --fastsync-server-path\n");
+      if (set_string_option(&config->fastsync_server_path, argv[++i], "--fastsync-server-path") !=
+          0)
        return -1;
-      }
-      free(config->fastsync_server_path);
-      config->fastsync_server_path = dup;
    } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
      set_log_level(LOG_LEVEL_DEBUG);
    } else if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "--links") == 0) {
@@ -297,185 +322,28 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
      config->safe_links = true;
    } else if (strcmp(argv[i], "--copy-unsafe-links") == 0) {
      config->copy_unsafe_links = true;
-    } else if (strcmp(argv[i], "-H") == 0 || strcmp(argv[i], "--hard-links") == 0) {
-      config->preserve_hard_links = true;
-    } else if (strcmp(argv[i], "-A") == 0 || strcmp(argv[i], "--acls") == 0) {
-      config->preserve_acls = true;
-    } else if (strcmp(argv[i], "-X") == 0 || strcmp(argv[i], "--xattrs") == 0) {
-      config->preserve_xattrs = true;
-    } else if (strcmp(argv[i], "-D") == 0 || strcmp(argv[i], "--devices") == 0) {
-      config->preserve_devices = true;
    } else if (strcmp(argv[i], "-S") == 0 || strcmp(argv[i], "--sparse") == 0) {
      config->preserve_sparse = true;
-    } else if (strcmp(argv[i], "-i") == 0 || strcmp(argv[i], "--itemize-changes") == 0) {
-      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;
-      free(config->out_format);
-      config->out_format = dup;
-    } else if (strcmp(argv[i], "--info") == 0 && i + 1 < argc) {
-      config->info_level = atoi(argv[++i]);
-    } else if (strcmp(argv[i], "--debug") == 0 && i + 1 < argc) {
-      config->debug_level = atoi(argv[++i]);
-    } else if (strcmp(argv[i], "--list-only") == 0) {
-      config->list_only = true;
-    } else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--human-readable") == 0) {
-      config->human_readable = true;
-    } else if (strcmp(argv[i], "-u") == 0 || strcmp(argv[i], "--update") == 0) {
-      config->update = true;
    } else if (strcmp(argv[i], "--inplace") == 0) {
      config->inplace = true;
-    } else if (strcmp(argv[i], "--append") == 0) {
-      config->append = true;
-    } else if (strcmp(argv[i], "--append-verify") == 0) {
-      config->append_verify = true;
-    } else if (strcmp(argv[i], "--delete-excluded") == 0) {
-      config->delete_excluded = true;
-    } else if (strcmp(argv[i], "--delete-after") == 0) {
-      config->delete_after = true;
-    } else if (strcmp(argv[i], "--max-delete") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_nonneg_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: --max-delete must be a non-negative integer\n");
-        return -1;
-      }
-      config->max_delete = val;
-    } else if (strcmp(argv[i], "--filter") == 0 && i + 1 < argc) {
-      if (!config->filters)
-        config->filters = array_list_create(free);
-      char* dup = str_dup(argv[++i]);
-      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;
-      free(config->files_from);
-      config->files_from = dup;
-    } else if (strcmp(argv[i], "--cvs-exclude") == 0) {
-      config->cvs_exclude = true;
-    } else if (strcmp(argv[i], "--prune-empty-dirs") == 0) {
-      config->prune_empty_dirs = true;
-    } else if (strcmp(argv[i], "-R") == 0 || strcmp(argv[i], "--relative") == 0) {
-      config->relative = true;
-    } 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;
-        free(config->rsh_command);
-        config->rsh_command = dup;
-      } else {
-        fprintf(stderr, "Error: -e/--rsh requires a command argument\n");
-        return -1;
-      }
-    } else if (strcmp(argv[i], "--rsync-path") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      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;
-      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;
-      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;
-      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;
-      free(config->link_dest);
-      config->link_dest = dup;
    } else if (strcmp(argv[i], "--partial-dir") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --partial-dir\n");
+      if (set_string_option(&config->partial_dir, argv[++i], "--partial-dir") != 0)
        return -1;
-      }
-      free(config->partial_dir);
-      config->partial_dir = dup;
    } else if (strcmp(argv[i], "--suffix") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup) {
-        fprintf(stderr, "Error: memory allocation failed for --suffix\n");
+      if (set_string_option(&config->suffix, argv[++i], "--suffix") != 0)
        return -1;
-      }
-      free(config->suffix);
-      config->suffix = dup;
-    } else if (strcmp(argv[i], "--delete-before") == 0) {
-      config->delete_before = true;
    } else if (strcmp(argv[i], "-T") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_positive_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: -T must be a positive integer\n");
+      if (set_positive_int_option(&config->timeout, argv[++i], "-T") != 0)
        return -1;
-      }
-      config->timeout = val;
-    } else if (strcmp(argv[i], "--address") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup)
-        return -1;
-      free(config->address);
-      config->address = dup;
-    } else if (strcmp(argv[i], "--bind-address") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup)
-        return -1;
-      free(config->bind_address);
-      config->bind_address = dup;
-    } else if (strcmp(argv[i], "--ipv6") == 0) {
-      config->ipv6 = true;
-    } else if (strcmp(argv[i], "--ipv4") == 0) {
-      config->ipv4 = true;
-    } else if (strcmp(argv[i], "--daemon") == 0) {
-      config->daemon = true;
-    } else if (strcmp(argv[i], "--config") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup)
-        return -1;
-      free(config->daemon_config);
-      config->daemon_config = dup;
-    } else if (strcmp(argv[i], "--server") == 0) {
-      config->server_mode = true;
    } else if (strcmp(argv[i], "--checksum") == 0) {
      config->checksum = true;
-    } else if (strcmp(argv[i], "--compress-choice") == 0 && i + 1 < argc) {
-      char* dup = str_dup(argv[++i]);
-      if (!dup)
-        return -1;
-      free(config->compress_choice);
-      config->compress_choice = dup;
-      if (strcmp(config->compress_choice, "zstd") == 0)
-        config->use_compression = true;
-      else if (strcmp(config->compress_choice, "none") == 0)
-        config->use_compression = false;
-      else {
-        fprintf(stderr, "Error: --compress-choice must be 'zstd' or 'none'\n");
-        return -1;
-      }
    } else if (strcmp(argv[i], "--compress-level") == 0 && i + 1 < argc) {
-      int val;
-      if (!parse_positive_int(argv[++i], &val)) {
-        fprintf(stderr, "Error: --compress-level must be a positive integer\n");
+      if (set_positive_int_option(&config->compression_level, argv[++i], "--compress-level") != 0)
+        return -1;
+      if (config->compression_level < 1 || config->compression_level > 22) {
+        fprintf(stderr, "Error: --compress-level must be between 1 and 22\n");
        return -1;
      }
-      config->compression_level = val;
    } else if (argv[i][0] == '-') {
      fprintf(stderr, "Unknown option: %s\n", argv[i]);
      print_usage();
@@ -493,170 +361,16 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
  return 0;
 }

-/* Validate config after parsing. Returns true if valid. */
-static bool validate_config(const Config* config) {
-  if (!config->send_directory || !config->receive_root_directory) {
-    fprintf(stderr, "Error: source and destination directories are required\n");
-    print_usage();
-    return false;
-  }
-  if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
-    fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk "
-                    "serialization)\n");
-    return false;
-  }
-  if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
-    fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
-    return false;
-  }
-  if (config->use_incremental && config->use_chunk_serialization) {
-    fprintf(stderr, "Error: --incremental is not supported with -s (chunk serialization)\n");
-    return false;
-  }
-  if (config->use_delta && !config->use_incremental) {
-    fprintf(stderr, "Error: --delta requires --incremental\n");
-    return false;
-  }
-  if (config->use_delta && config->use_chunk_serialization) {
-    fprintf(stderr, "Error: --delta cannot be combined with -s (chunk serialization)\n");
-    return false;
-  }
-  if (config->use_delta && config->use_sendfile) {
-    fprintf(stderr, "Error: --delta cannot be combined with -f (sendfile)\n");
-    return false;
-  }
-  if (config->append || config->append_verify) {
-    fprintf(
-        stderr,
-        "Error: --append and --append-verify are not supported yet; refusing to ignore option\n");
-    return false;
-  }
-  if (config->use_tls) {
-    if (!config->tls_cert || !config->tls_key) {
-      fprintf(stderr, "Error: --tls requires --cert and --key\n");
-      return false;
-    }
-  }
-  return true;
-}
-
-static void print_usage(void) {
-  printf("Usage:\n");
-  printf("  fastsync [options] <source> <destination>\n");
-  printf("  fastsync [options] --source-dir <src> --dest-dir <dst>\n");
-  printf("\n");
-  printf("Destination formats:\n");
-  printf("  user@host:/path     SSH transport (rsync-style)\n");
-  printf("  host:/path          SSH transport (current user)\n");
-  printf("  /local/path         TCP transport (requires server on localhost:8080)\n");
-  printf("\n");
-  printf("Options:\n");
-  printf("  -c [level]          Enable compression (level 1-22, default 5)\n");
-  printf("  -z [level]          Alias for -c\n");
-  printf("  -a, --archive       Archive mode (-c -m -M)\n");
-  printf("  -n, --dry-run       Show what would be transferred\n");
-  printf("  -p <port>           SSH port (default: 22)\n");
-  printf("  --progress          Show transfer progress\n");
-  printf("  --delete            Delete files on receiver not in source\n");
-  printf("  --exclude <pattern> Exclude files matching pattern\n");
-  printf("  --include <pattern> Only include files matching pattern\n");
-  printf("  --exclude-from <file> Read exclude patterns from file\n");
-  printf("  --include-from <file> Read include patterns from file\n");
-  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("  --delta             Delta transfer for changed files (requires --incremental)\n");
-  printf("  --delta-block <n>   Delta block size in bytes (default: %d)\n",
-         DELTA_BLOCK_SIZE_DEFAULT);
-  printf("  --delta-max <n>     Max file size for delta transfer (default: %llu)\n",
-         DELTA_MAX_FILE_SIZE);
-  printf("  -m                  Enable multithreading\n");
-  printf("  -s                  Enable chunk serialization\n");
-  printf("  -f                  Enable sendfile (TCP only, not with -c or -s)\n");
-  printf("  -v, --verbose       Enable debug logging\n");
-  printf("  -M, --preserve      Preserve file metadata\n");
-  printf("  --chunk-size <n>    Chunk size in bytes (default: %d)\n", DEFAULT_CHUNK_SIZE);
-  printf("  --source-dir <path> Source directory\n");
-  printf("  --dest-dir <path>   Destination directory\n");
-  printf("  --save-to-disk      Write received files to disk\n");
-  printf("  --server-host <ip>  Server IP address (default: 127.0.0.1)\n");
-  printf("  --server-port <n>   Server port (default: 8080)\n");
-  printf("  --bwlimit <KB/s>    Bandwidth limit in kilobytes per second\n");
-  printf("  --tls               Enable TLS encryption\n");
-  printf("  --cert <path>       TLS certificate file (PEM)\n");
-  printf("  --key <path>        TLS private key file (PEM)\n");
-  printf("  --ca <path>         TLS CA certificate file (PEM)\n");
-  printf("  --timeout <sec>     I/O timeout in seconds (default: 30)\n");
-  printf("  -T <sec>            Alias for --timeout\n");
-  printf("  --contimeout <sec>  Connection timeout in seconds (default: 10)\n");
-  printf("  --address <host>    Server hostname/IP to connect to\n");
-  printf("  --bind-address <ip> Bind to specific local address\n");
-  printf("  --ipv6              Prefer IPv6 connections\n");
-  printf("  --ipv4              Prefer IPv4 connections\n");
-  printf("  -q, --quiet         Suppress non-error output\n");
-  printf("  --silent            Alias for --quiet\n");
-  printf("  --backup            Backup existing files before overwriting\n");
-  printf("  --backup-dir <dir>  Directory for backups (requires --backup)\n");
-  printf("  --suffix <str>      Backup suffix (default: ~)\n");
-  printf("  --stats             Print transfer statistics at end\n");
-  printf("  --max-depth <n>     Maximum directory depth (0=unlimited)\n");
-  printf("  --log-file <path>   Write log messages to file\n");
-  printf("  --queue-size <n>    Queue capacity for multithreaded mode (default: 100)\n");
-  printf("  --partial           Keep partial files on interrupted transfer\n");
-  printf("  --partial-dir <dir> Directory for partial files\n");
-  printf("  --fastsync-server-path <path>\n");
-  printf("                      Path to fastsync-server on remote (default: fastsync-server)\n");
-  printf("  -l, --links         Copy symlinks as symlinks\n");
-  printf("  --copy-links        Transform symlinks into referent files\n");
-  printf("  --safe-links        Skip symlinks that point outside transfer tree\n");
-  printf("  --copy-unsafe-links  Only transform unsafe symlinks into referent files\n");
-  printf("  -H, --hard-links    Preserve hard links\n");
-  printf("  -A, --acls          Preserve ACLs\n");
-  printf("  -X, --xattrs        Preserve extended attributes\n");
-  printf("  -D, --devices       Preserve device files\n");
-  printf("  -S, --sparse        Handle sparse files efficiently\n");
-  printf("  -i, --itemize-changes  Show per-file change summary\n");
-  printf("  --out-format <fmt>  Custom output format string\n");
-  printf("  --info <flags>      Info verbosity level\n");
-  printf("  --debug <flags>     Debug verbosity level\n");
-  printf("  --list-only         List files without transferring\n");
-  printf("  -h, --human-readable  Human-readable numbers\n");
-  printf("  -u, --update        Skip files newer on destination\n");
-  printf("  --inplace           Update files in-place (no temp+rename)\n");
-  printf("  --append            Append data to shorter files\n");
-  printf("  --append-verify     Append with verify\n");
-  printf("  --delete-before     Delete before transfer\n");
-  printf("  --delete-excluded   Also delete excluded files\n");
-  printf("  --delete-after      Delete after transfer, not before\n");
-  printf("  --max-delete <n>    Maximum number of files to delete\n");
-  printf("  --filter <rule>     Add file filtering rule\n");
-  printf("  --files-from <file> Read file list from file\n");
-  printf("  --cvs-exclude       Auto-ignore CVS files\n");
-  printf("  --prune-empty-dirs  Omit empty directories from transfer\n");
-  printf("  -R, --relative      Use relative paths\n");
-  printf("  -e, --rsh <cmd>     Specify remote shell\n");
-  printf("  --rsync-path <path> Path to remote binary\n");
-  printf("  --daemon            Run in daemon mode\n");
-  printf("  --config <path>     Path to configuration file\n");
-  printf("  --server            Run in server mode\n");
-  printf("  --checksum          Skip files based on checksum, not mod-time/size\n");
-  printf("  --compress-choice <alg>  Compression algorithm (default: zstd)\n");
-  printf("  --compress-level <n>    Compression level (default: 5)\n");
-  printf("  --temp-dir <dir>    Temporary directory for files\n");
-  printf("  --compare-dest <dir>  Compare destination\n");
-  printf("  --copy-dest <dir>   Copy destination\n");
-  printf("  --link-dest <dir>   Link destination\n");
-  printf("  --help              Show this help\n");
-}
-
 static int read_patterns_from_file(const char* filepath, char*** patterns, int* count) {
  FILE* fp = fopen(filepath, "r");
  if (!fp) {
    fprintf(stderr, "Error: could not open pattern file '%s': %s\n", filepath, strerror(errno));
    return -1;
  }
-  char line[4096];
-  while (fgets(line, sizeof(line), fp)) {
+  char* line = NULL;
+  size_t line_size = 0;
+  ssize_t n;
+  while ((n = getline(&line, &line_size, fp)) != -1) {
    char* p = line;
    while (*p == ' ' || *p == '\t')
      p++;
@@ -670,6 +384,7 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
    char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*));
    if (!tmp) {
      fprintf(stderr, "Error: memory allocation failed for pattern file\n");
+      free(line);
      fclose(fp);
      return -1;
    }
@@ -677,15 +392,18 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
    char* dup = str_dup(p);
    if (!dup) {
      fprintf(stderr, "Error: memory allocation failed for pattern file\n");
+      free(line);
      fclose(fp);
      return -1;
    }
    (*patterns)[(*count)++] = dup;
  }
+  free(line);
  fclose(fp);
  return 0;
 }

+#ifndef FASTSYNC_TEST_BUILD
 int main(int argc, char* argv[]) {
  const char* env_source = NULL;
  const char* env_dest = NULL;
@@ -791,3 +509,4 @@ cleanup:
  }
  return exit_code;
 }
+#endif /* FASTSYNC_TEST_BUILD */
@@ -28,13 +28,106 @@
 /* Forward declaration for progress-reporting thread used in multithreaded send. */
 static int progress_thread_fn(void* arg);

+static ScannerOptions scanner_options_from_config(const Config* config, int num_threads) {
+  ScannerOptions options = {
+      config->use_metadata,  config->chunk_size,        config->exclude_patterns,
+      config->exclude_count, config->include_patterns,  config->include_count,
+      config->max_size,      config->min_size,          config->max_depth,
+      num_threads,           config->follow_symlinks,   config->copy_links,
+      config->safe_links,    config->copy_unsafe_links, config->checksum};
+  return options;
+}
+
+/* Select the configured transport for both transfer execution paths. */
+static Client* connect_transfer_client(const Config* config) {
+  if (config->transport == TRANSPORT_SSH) {
+    if (config->use_sendfile) {
+      fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
+      return NULL;
+    }
+    return client_connect_ssh(config->ssh_destination, config->ssh_port,
+                              config->fastsync_server_path);
+  }
+
+  Client* client = client_create();
+  if (!client)
+    return NULL;
+  bool connected;
+  if (config->use_tls) {
+    connected = client_connect_tls(client, config->server_host, config->server_port,
+                                   config->tls_cert, config->tls_key, config->tls_ca);
+  } else {
+    connected = client_connect(client, config->server_host, config->server_port);
+  }
+  if (!connected) {
+    client_delete(client);
+    return NULL;
+  }
+  return client;
+}
+
+static void disconnect_transfer_client(Client* client) {
+  if (!client)
+    return;
+  client_disconnect(client);
+  client_delete(client);
+}
+
+static ArrayList* create_transfer_manifest(const Config* config) {
+  return config->use_delete ? array_list_create(free) : NULL;
+}
+
+static bool add_chunk_to_manifest(ArrayList* manifest, const Chunk* chunk) {
+  if (!manifest)
+    return true;
+  for (int i = 0; i < chunk->element_count; i++) {
+    const char* path = chunk->items[i]->path;
+    if (*path == '/')
+      path++;
+    char* entry = str_dup(path);
+    if (!entry) {
+      log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
+      return false;
+    }
+    if (!array_list_add(manifest, entry)) {
+      free(entry);
+      return false;
+    }
+  }
+  return true;
+}
+
+static bool finalize_transfer(Client* client) {
+  Status status;
+  return send_status(client->file_descriptor, STATUS_FINISHED) &&
+         receive_status(client->file_descriptor, &status) && status == STATUS_OK;
+}
+
+static void mark_sender_done(PipelineContextSender* context) {
+  mtx_lock(&context->mutex_progress);
+  context->sender_done = true;
+  mtx_unlock(&context->mutex_progress);
+}
+
+static void pipeline_cancel(PipelineContextSender* context) {
+  mtx_lock(&context->mutex_scanner);
+  mtx_lock(&context->mutex_loader);
+  atomic_store(&context->cancelled, true);
+  context->scanner_done = true;
+  context->loader_done = true;
+  cnd_broadcast(&context->condition_not_full_scanner);
+  cnd_broadcast(&context->condition_not_empty_scanner);
+  cnd_broadcast(&context->condition_not_full_loader);
+  cnd_broadcast(&context->condition_not_empty_loader);
+  mtx_unlock(&context->mutex_loader);
+  mtx_unlock(&context->mutex_scanner);
+}
+
 /* Print dry-run manifest showing files that would be transferred. Returns 0 on success. */
-static int send_dry_run_manifest(Config* config) {
-  DirectoryScanner* scanner = directory_scanner_create(
-      config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
-      config->exclude_count, config->include_patterns, config->include_count, config->max_size,
-      config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
-      config->safe_links, config->copy_unsafe_links, config->checksum);
+static int send_dry_run_manifest(const Config* config) {
+  ScannerOptions options = scanner_options_from_config(config, 0);
+  DirectoryScanner* scanner =
+      directory_scanner_create_with_options(config->send_directory, &options);
  if (!scanner)
    return -1;
  Chunk* chunk;
@@ -277,49 +370,22 @@ int send_chunk(Client* client, Chunk* chunk, Config* config) {

 static int send_chunks_multithreaded(void* pipeline_context) {
  PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
-  Client* client;
-  if (context->config->transport == TRANSPORT_SSH) {
-    if (context->config->use_sendfile) {
-      fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
-      return 1;
-    }
-    client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port,
-                                context->config->fastsync_server_path);
-  } else if (context->config->use_tls) {
-    client = client_create();
-    if (!client || !client_connect_tls(client, context->config->server_host,
-                                       context->config->server_port, context->config->tls_cert,
-                                       context->config->tls_key, context->config->tls_ca)) {
-      if (client)
-        client_delete(client);
-      fprintf(stderr, "Error: could not connect to server via TLS\n");
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
-      return thrd_error;
-    }
-  } else {
-    client = client_create();
-    if (!client ||
-        !client_connect(client, context->config->server_host, context->config->server_port)) {
-      if (client)
-        client_delete(client);
-      fprintf(stderr, "Error: could not connect to server\n");
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
-      return thrd_error;
-    }
+  Client* client = connect_transfer_client(context->config);
+  if (!client) {
+    if (context->config->transport == TRANSPORT_TCP)
+      fprintf(stderr, "Error: could not connect to server%s\n",
+              context->config->use_tls ? " via TLS" : "");
+    mark_sender_done(context);
+    return thrd_error;
  }
+  ProtocolSession session;
+  protocol_session_init(&session, client->file_descriptor, client->file_descriptor);
+  protocol_session_set_ssl(&session, (SSL*)client->ssl);
+  protocol_session_bind(&session);
  if (!config_send(client->file_descriptor, context->config)) {
-    client_disconnect(client);
-    client_delete(client);
-    mtx_lock(&context->mutex_progress);
-    context->sender_done = true;
-    mtx_unlock(&context->mutex_progress);
+    disconnect_transfer_client(client);
+    mark_sender_done(context);
+    protocol_session_unbind();
    return thrd_error;
  }

@@ -332,32 +398,26 @@ static int send_chunks_multithreaded(void* pipeline_context) {
        if (send_delete_manifest(client->file_descriptor, context->manifest) != 0)
          goto send_fail;
      }
-      if (!send_status(client->file_descriptor, STATUS_FINISHED))
-        goto send_fail;
-      Status s;
-      int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
-      client_disconnect(client);
-      client_delete(client);
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
+      bool ok = finalize_transfer(client);
+      disconnect_transfer_client(client);
+      mark_sender_done(context);
+      protocol_session_unbind();
      return ok ? thrd_success : thrd_error;

    send_fail:
-      client_disconnect(client);
-      client_delete(client);
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
+      pipeline_cancel(context);
+      disconnect_transfer_client(client);
+      mark_sender_done(context);
+      protocol_session_unbind();
      return thrd_error;
    }
    if (send_chunk(client, current_chunk, context->config) != 0) {
      fprintf(stderr, "Error: unexpected error while sending chunk\n");
-      client_disconnect(client);
-      client_delete(client);
-      mtx_lock(&context->mutex_progress);
-      context->sender_done = true;
-      mtx_unlock(&context->mutex_progress);
+      chunk_destroy(current_chunk);
+      pipeline_cancel(context);
+      disconnect_transfer_client(client);
+      mark_sender_done(context);
+      protocol_session_unbind();
      return thrd_error;
    }
    if (context->config->show_progress) {
@@ -376,29 +436,47 @@ static int send_chunks_multithreaded(void* pipeline_context) {

 static int scan_directory_multithreaded(void* pipeline_context) {
  PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
-  ParallelScanner* scanner = parallel_scanner_create(
-      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->checksum);
+  ScannerOptions options = scanner_options_from_config(context->config, 4);
+  ParallelScanner* scanner =
+      parallel_scanner_create_with_options(context->config->send_directory, &options);

  Chunk* current_chunk;
+  if (scanner == NULL) {
+    log_message(LOG_LEVEL_ERROR, "Failed to create parallel scanner");
+    pipeline_cancel(context);
+    return thrd_error;
+  }
  while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
    if (context->config->use_delete) {
      mtx_lock(&context->mutex_scanner);
-      for (int i = 0; i < current_chunk->element_count; i++) {
-        const char* p = current_chunk->items[i]->path;
-        if (*p == '/')
-          p++;
-        array_list_add(context->manifest, str_dup(p));
-      }
+      bool manifest_ok = add_chunk_to_manifest(context->manifest, current_chunk);
      mtx_unlock(&context->mutex_scanner);
+      if (!manifest_ok) {
+        pipeline_cancel(context);
+        chunk_destroy(current_chunk);
+        parallel_scanner_destroy(scanner);
+        return thrd_error;
+      }
    }
-    queue_enqueue_multithreaded(context->queue_scanner, current_chunk, &context->mutex_scanner,
-                                &context->condition_not_empty_scanner,
-                                &context->condition_not_full_scanner);
+    if (!queue_enqueue_multithreaded_cancel(
+            context->queue_scanner, current_chunk, &context->mutex_scanner,
+            &context->condition_not_empty_scanner, &context->condition_not_full_scanner,
+            &context->cancelled)) {
+      chunk_destroy(current_chunk);
+      pipeline_cancel(context);
+      parallel_scanner_destroy(scanner);
+      return thrd_error;
+    }
+  }
+  if (parallel_scanner_failed(scanner)) {
+    parallel_scanner_destroy(scanner);
+    mtx_lock(&context->mutex_scanner);
+    context->scanner_done = true;
+    cnd_broadcast(&context->condition_not_empty_scanner);
+    cnd_broadcast(&context->condition_not_full_scanner);
+    mtx_unlock(&context->mutex_scanner);
+    pipeline_cancel(context);
+    return thrd_error;
  }
  mtx_lock(&context->mutex_scanner);
  context->scanner_done = true;
@@ -434,9 +512,16 @@ static int load_files_multithreaded(void* pipeline_context) {
        }
      }
    }
-    queue_enqueue_multithreaded(context->queue_loader, chunk, &context->mutex_loader,
-                                &context->condition_not_empty_loader,
-                                &context->condition_not_full_loader);
+    if (!queue_enqueue_multithreaded_cancel(context->queue_loader, chunk, &context->mutex_loader,
+                                            &context->condition_not_empty_loader,
+                                            &context->condition_not_full_loader,
+                                            &context->cancelled)) {
+      chunk_destroy(chunk);
+      atomic_store(&context->cancelled, true);
+      cnd_broadcast(&context->condition_not_full_loader);
+      cnd_broadcast(&context->condition_not_empty_loader);
+      return thrd_error;
+    }
  }
 }

@@ -480,61 +565,48 @@ int send_files(Config* config) {
  if (config->dry_run)
    return send_dry_run_manifest(config);

-  Client* client;
-  if (config->transport == TRANSPORT_SSH) {
-    if (config->use_sendfile) {
-      fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
-      return 1;
-    }
-    client =
-        client_connect_ssh(config->ssh_destination, config->ssh_port, config->fastsync_server_path);
-    if (!client)
-      return 1;
-  } else if (config->use_tls) {
-    client = client_create();
-    if (!client || !client_connect_tls(client, config->server_host, config->server_port,
-                                       config->tls_cert, config->tls_key, config->tls_ca)) {
-      if (client)
-        client_delete(client);
-      fprintf(stderr, "Error: could not connect to server via TLS\n");
-      return 1;
-    }
-  } else {
-    client = client_create();
-    if (!client || !client_connect(client, config->server_host, config->server_port)) {
-      if (client)
-        client_delete(client);
-      fprintf(stderr, "Error: could not connect to server\n");
-      return 1;
-    }
-  }
-  if (!config_send(client->file_descriptor, config)) {
-    client_disconnect(client);
-    client_delete(client);
+  Client* client = connect_transfer_client(config);
+  if (!client) {
+    if (config->transport == TRANSPORT_TCP)
+      fprintf(stderr, "Error: could not connect to server%s\n", config->use_tls ? " via TLS" : "");
    return 1;
  }
-  DirectoryScanner* scanner = directory_scanner_create(
-      config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
-      config->exclude_count, config->include_patterns, config->include_count, config->max_size,
-      config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
-      config->safe_links, config->copy_unsafe_links, config->checksum);
+  ProtocolSession session;
+  protocol_session_init(&session, client->file_descriptor, client->file_descriptor);
+  protocol_session_set_ssl(&session, (SSL*)client->ssl);
+  protocol_session_bind(&session);
+  if (!config_send(client->file_descriptor, config)) {
+    disconnect_transfer_client(client);
+    protocol_session_unbind();
+    return 1;
+  }
+  ScannerOptions scanner_options = scanner_options_from_config(config, 0);
+  DirectoryScanner* scanner =
+      directory_scanner_create_with_options(config->send_directory, &scanner_options);
  Chunk* current_chunk;
  unsigned long long total_bytes = 0;
  int total_files = 0;
  time_t last_progress = 0;
  time_t start = time(NULL);
-  ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
+  ArrayList* manifest = create_transfer_manifest(config);
+  if (!scanner || (config->use_delete && !manifest)) {
+    if (scanner)
+      directory_scanner_destroy(scanner);
+    if (manifest)
+      array_list_delete(manifest);
+    disconnect_transfer_client(client);
+    protocol_session_unbind();
+    return 1;
+  }
  while ((current_chunk = directory_scanner_next(scanner)) != NULL) {
    unsigned long long chunk_bytes = 0;
    for (int i = 0; i < current_chunk->element_count; i++) {
      chunk_bytes += current_chunk->items[i]->data->size;
      total_files++;
-      if (manifest) {
-        const char* p = current_chunk->items[i]->path;
-        if (*p == '/')
-          p++;
-        array_list_add(manifest, str_dup(p));
-      }
+    }
+    if (!add_chunk_to_manifest(manifest, current_chunk)) {
+      chunk_destroy(current_chunk);
+      goto send_fail;
    }
    if (!config->use_sendfile) {
      for (int i = 0; i < current_chunk->element_count; i++) {
@@ -550,6 +622,9 @@ int send_files(Config* config) {
    if (send_chunk(client, current_chunk, config) != 0) {
      log_message(LOG_LEVEL_ERROR, "Failed to send chunk");
      chunk_destroy(current_chunk);
+      if (manifest)
+        array_list_delete(manifest);
+      manifest = NULL;
      break;
    }
    if (config->show_progress) {
@@ -565,17 +640,17 @@ int send_files(Config* config) {
    }
    chunk_destroy(current_chunk);
  }
+  if (directory_scanner_failed(scanner) || (config->use_delete && manifest == NULL))
+    goto send_fail;
  if (config->use_delete) {
    if (send_delete_manifest(client->file_descriptor, manifest) != 0) {
      array_list_delete(manifest);
      goto send_fail;
    }
    array_list_delete(manifest);
+    manifest = NULL;
  }
-  if (!send_status(client->file_descriptor, STATUS_FINISHED))
-    goto send_fail;
-  Status s;
-  int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
+  bool ok = finalize_transfer(client);
  double elapsed_total = difftime(time(NULL), start);
  if (config->show_progress) {
    double rate = elapsed_total > 0 ? total_bytes / (1048576.0 * elapsed_total) : 0;
@@ -587,14 +662,16 @@ int send_files(Config* config) {
            rate);
  }
  directory_scanner_destroy(scanner);
-  client_disconnect(client);
-  client_delete(client);
+  disconnect_transfer_client(client);
+  protocol_session_unbind();
  return ok ? 0 : 1;

 send_fail:
+  if (manifest)
+    array_list_delete(manifest);
  directory_scanner_destroy(scanner);
-  client_disconnect(client);
-  client_delete(client);
+  disconnect_transfer_client(client);
+  protocol_session_unbind();
  return 1;
 }

@@ -630,19 +707,40 @@ int send_files_multithreaded(Config* config) {
    return 1;
  }
  if (config->use_delete)
-    context->manifest = array_list_create(free);
+    context->manifest = create_transfer_manifest(config);

-  thrd_t scanner, loader, sender, progress;
-  if (thrd_create(&scanner, scan_directory_multithreaded, context) != thrd_success ||
-      thrd_create(&loader, load_files_multithreaded, context) != thrd_success ||
-      thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) {
+  thrd_t scanner, loader, sender;
+  bool scanner_created = false;
+  bool loader_created = false;
+  bool sender_created = false;
+
+  scanner_created = (thrd_create(&scanner, scan_directory_multithreaded, context) == thrd_success);
+  if (scanner_created)
+    loader_created = (thrd_create(&loader, load_files_multithreaded, context) == thrd_success);
+  if (scanner_created && loader_created)
+    sender_created = (thrd_create(&sender, send_chunks_multithreaded, context) == thrd_success);
+
+  if (!scanner_created || !loader_created || !sender_created) {
    perror("Error creating threads.\n");
+    pipeline_cancel(context);
+    mtx_lock(&context->mutex_progress);
+    context->sender_done = true;
+    mtx_unlock(&context->mutex_progress);
+    if (sender_created)
+      thrd_join(sender, NULL);
+    if (loader_created)
+      thrd_join(loader, NULL);
+    if (scanner_created)
+      thrd_join(scanner, NULL);
    pipeline_context_sender_destroy(context);
    return 1;
  }

+  thrd_t progress;
+  bool progress_created = false;
  if (config->show_progress) {
-    if (thrd_create(&progress, progress_thread_fn, context) != thrd_success) {
+    progress_created = (thrd_create(&progress, progress_thread_fn, context) == thrd_success);
+    if (!progress_created) {
      perror("Error creating progress thread.\n");
      /* Non-fatal; continue without progress reporting */
    }
@@ -653,7 +751,7 @@ int send_files_multithreaded(Config* config) {
  thrd_join(loader, NULL);
  thrd_join(sender, &sender_result);

-  if (config->show_progress) {
+  if (progress_created) {
    /* Signal progress thread to exit if it hasn't already */
    mtx_lock(&context->mutex_progress);
    context->sender_done = true;
@@ -0,0 +1,50 @@
+#include "client_validation.h"
+#include "usage.h"
+#include <stdio.h>
+
+/* Validate config after parsing. Returns true if valid. */
+bool validate_config(const Config* config) {
+  if (!config->send_directory || !config->receive_root_directory) {
+    fprintf(stderr, "Error: source and destination directories are required\n");
+    print_usage();
+    return false;
+  }
+  if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
+    fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk "
+                    "serialization)\n");
+    return false;
+  }
+  if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
+    fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
+    return false;
+  }
+  if (config->use_incremental && config->use_chunk_serialization) {
+    fprintf(stderr, "Error: --incremental is not supported with -s (chunk serialization)\n");
+    return false;
+  }
+  if (config->use_delta && !config->use_incremental) {
+    fprintf(stderr, "Error: --delta requires --incremental\n");
+    return false;
+  }
+  if (config->use_delta && config->use_chunk_serialization) {
+    fprintf(stderr, "Error: --delta cannot be combined with -s (chunk serialization)\n");
+    return false;
+  }
+  if (config->use_delta && config->use_sendfile) {
+    fprintf(stderr, "Error: --delta cannot be combined with -f (sendfile)\n");
+    return false;
+  }
+  if (config->append || config->append_verify) {
+    fprintf(
+        stderr,
+        "Error: --append and --append-verify are not supported yet; refusing to ignore option\n");
+    return false;
+  }
+  if (config->use_tls) {
+    if (!config->tls_cert || !config->tls_key) {
+      fprintf(stderr, "Error: --tls requires --cert and --key\n");
+      return false;
+    }
+  }
+  return true;
+}
@@ -0,0 +1,9 @@
+#ifndef CLIENT_VALIDATION_H
+#define CLIENT_VALIDATION_H
+
+#include "config.h"
+#include <stdbool.h>
+
+bool validate_config(const Config* config);
+
+#endif
@@ -11,6 +11,7 @@
 #include <sys/stat.h>
 #include <threads.h>
 #include <unistd.h>
+#include <limits.h>

 typedef struct {
  char* path;
@@ -27,13 +28,149 @@ static void dir_entry_destroy(void* item) {

 static DirEntry* dir_entry_create(const char* path, int depth) {
  DirEntry* de = malloc(sizeof(DirEntry));
-  if (de) {
-    de->path = str_dup(path);
-    de->depth = depth;
+  if (!de)
+    return NULL;
+  de->path = str_dup(path);
+  if (!de->path) {
+    free(de);
+    return NULL;
  }
+  de->depth = depth;
  return de;
 }

+static bool safe_relative_link(const char* source_root, const char* containing_dir,
+                               const char* link_target) {
+  char root[PATH_MAX];
+  if (!realpath(source_root, root))
+    return false;
+  char* joined = path_cat(containing_dir, link_target);
+  char resolved[PATH_MAX];
+  bool safe = joined && realpath(joined, resolved) && strncmp(root, resolved, strlen(root)) == 0 &&
+              (resolved[strlen(root)] == '\0' || resolved[strlen(root)] == '/');
+  free(joined);
+  return safe;
+}
+
+typedef struct {
+  char* path;
+  struct stat stats;
+  bool is_directory;
+} ScannerEntry;
+
+/* Inspect symlinks, resolve the entry type, and apply file filters once for both scanners. */
+static int scanner_inspect_entry(const ScannerOptions* options, const char* source_root,
+                                 const char* containing_dir, const char* name,
+                                 ScannerEntry* entry) {
+  entry->path = path_cat(containing_dir, name);
+  if (!entry->path)
+    return -1;
+
+  struct stat link_stats;
+  if (lstat(entry->path, &link_stats) != 0) {
+    free(entry->path);
+    return 0;
+  }
+  bool is_symlink = S_ISLNK(link_stats.st_mode);
+  if (is_symlink && !options->follow_symlinks && !options->copy_links && !options->safe_links &&
+      !options->copy_unsafe_links)
+    goto skip;
+
+  if (is_symlink && options->safe_links) {
+    char link_target[4096];
+    ssize_t length = readlink(entry->path, link_target, sizeof(link_target) - 1);
+    if (length < 0)
+      goto skip;
+    link_target[length] = '\0';
+    if (link_target[0] == '/' || !safe_relative_link(source_root, containing_dir, link_target))
+      goto skip;
+  }
+
+  if (is_symlink && options->copy_unsafe_links && !options->copy_links) {
+    char link_target[4096];
+    ssize_t length = readlink(entry->path, link_target, sizeof(link_target) - 1);
+    if (length < 0)
+      goto skip;
+    link_target[length] = '\0';
+    if (link_target[0] != '/')
+      goto skip;
+  }
+
+  if (is_symlink && options->follow_symlinks && !options->copy_links)
+    entry->stats = link_stats;
+  else if (stat(entry->path, &entry->stats) != 0)
+    goto skip;
+
+  entry->is_directory = S_ISDIR(entry->stats.st_mode);
+  if (entry->is_directory)
+    return 1;
+  for (int i = 0; i < options->exclude_count; i++)
+    if (glob_match(options->exclude_patterns[i], name))
+      goto skip;
+  if (options->include_count > 0) {
+    bool included = false;
+    for (int i = 0; i < options->include_count; i++)
+      if (glob_match(options->include_patterns[i], name))
+        included = true;
+    if (!included)
+      goto skip;
+  }
+  if ((options->max_size > 0 && (unsigned long long)entry->stats.st_size > options->max_size) ||
+      (options->min_size > 0 && (unsigned long long)entry->stats.st_size < options->min_size))
+    goto skip;
+  return 1;
+
+skip:
+  free(entry->path);
+  entry->path = NULL;
+  return 0;
+}
+
+DirectoryScanner* directory_scanner_create_with_options(const char* root_directory,
+                                                        const ScannerOptions* options) {
+  if (!root_directory || !options)
+    return NULL;
+  DirectoryScanner* scanner = calloc(1, sizeof(DirectoryScanner));
+  if (scanner == NULL)
+    return NULL;
+  scanner->directories = queue_create(100, dir_entry_destroy);
+  if (!scanner->directories) {
+    free(scanner);
+    return NULL;
+  }
+  scanner->current_dir = NULL;
+  scanner->current_path = NULL;
+  scanner->use_metadata = options->use_metadata;
+  scanner->chunk_size = options->chunk_size > 0 ? options->chunk_size : DESIRED_CHUNK_SIZE;
+  scanner->exclude_patterns = options->exclude_patterns;
+  scanner->exclude_count = options->exclude_count;
+  scanner->include_patterns = options->include_patterns;
+  scanner->include_count = options->include_count;
+  scanner->max_size = options->max_size;
+  scanner->min_size = options->min_size;
+  scanner->max_depth = options->max_depth;
+  scanner->current_depth = 0;
+  scanner->follow_symlinks = options->follow_symlinks;
+  scanner->copy_links = options->copy_links;
+  scanner->safe_links = options->safe_links;
+  scanner->copy_unsafe_links = options->copy_unsafe_links;
+  scanner->checksum = options->checksum;
+  scanner->failed = false;
+  DirEntry* root = dir_entry_create(root_directory, 0);
+  if (!root) {
+    queue_destroy(scanner->directories);
+    free(scanner);
+    return NULL;
+  }
+  if (!queue_enqueue(scanner->directories, root)) {
+    dir_entry_destroy(root);
+    queue_destroy(scanner->directories);
+    free(scanner);
+    return NULL;
+  }
+  return scanner;
+}
+
 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,
@@ -41,29 +178,11 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
                                           unsigned long long min_size, int max_depth,
                                           bool follow_symlinks, bool copy_links, bool safe_links,
                                           bool copy_unsafe_links, bool checksum) {
-  DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
-  if (scanner == NULL)
-    return NULL;
-  scanner->directories = queue_create(100, dir_entry_destroy);
-  scanner->current_dir = NULL;
-  scanner->current_path = NULL;
-  scanner->use_metadata = use_metadata;
-  scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
-  scanner->exclude_patterns = exclude_patterns;
-  scanner->exclude_count = exclude_count;
-  scanner->include_patterns = include_patterns;
-  scanner->include_count = include_count;
-  scanner->max_size = max_size;
-  scanner->min_size = min_size;
-  scanner->max_depth = max_depth;
-  scanner->current_depth = 0;
-  scanner->follow_symlinks = follow_symlinks;
-  scanner->copy_links = copy_links;
-  scanner->safe_links = safe_links;
-  scanner->copy_unsafe_links = copy_unsafe_links;
-  scanner->checksum = checksum;
-  queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
-  return scanner;
+  ScannerOptions options = {
+      use_metadata,    chunk_size, exclude_patterns, exclude_count,     include_patterns,
+      include_count,   max_size,   min_size,         max_depth,         0,
+      follow_symlinks, copy_links, safe_links,       copy_unsafe_links, checksum};
+  return directory_scanner_create_with_options(root_directory, &options);
 }

 void directory_scanner_destroy(DirectoryScanner* scanner) {
@@ -80,8 +199,12 @@ void directory_scanner_destroy(DirectoryScanner* scanner) {

 static Chunk* chunk_data_to_chunk(ArrayList* chunk_data) {
  void** chunk_items = array_list_to_array(chunk_data);
+  if (!chunk_items)
+    return NULL;
  Chunk* chunk = chunk_create((File**)chunk_items, chunk_data->size);
  free(chunk_items);
+  if (!chunk)
+    return NULL;
  chunk_data->item_destroyer = NULL;
  array_list_delete(chunk_data);
  return chunk;
@@ -106,6 +229,7 @@ static int open_next_directory(DirectoryScanner* scanner) {
    perror("Could not open directory");
    free(scanner->current_path);
    scanner->current_path = NULL;
+    scanner->failed = true;
    return -1;
  }
  return 1;
@@ -113,6 +237,10 @@ static int open_next_directory(DirectoryScanner* scanner) {

 Chunk* directory_scanner_next(DirectoryScanner* scanner) {
  ArrayList* chunk_data = array_list_create(file_destroy);
+  if (!chunk_data) {
+    scanner->failed = true;
+    return NULL;
+  }
  unsigned long long chunk_data_size = 0;

  while (1) {
@@ -121,10 +249,10 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
      if (ret == 0)
        break;
      if (ret < 0)
-        continue;
+        break;
    }

-    struct dirent* entry = readdir(scanner->current_dir);
+    const struct dirent* entry = readdir(scanner->current_dir);
    if (entry == NULL) {
      closedir(scanner->current_dir);
      scanner->current_dir = NULL;
@@ -136,67 +264,34 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
      continue;

-    char* cur_path = path_cat(scanner->current_path, entry->d_name);
-    struct stat stats;
-    struct stat lstats;
-    bool is_symlink = false;
-    if (lstat(cur_path, &lstats) != 0) {
-      free(cur_path);
+    ScannerOptions options = {scanner->use_metadata,     scanner->chunk_size,
+                              scanner->exclude_patterns, scanner->exclude_count,
+                              scanner->include_patterns, scanner->include_count,
+                              scanner->max_size,         scanner->min_size,
+                              scanner->max_depth,        0,
+                              scanner->follow_symlinks,  scanner->copy_links,
+                              scanner->safe_links,       scanner->copy_unsafe_links,
+                              scanner->checksum};
+    ScannerEntry inspected;
+    int inspection = scanner_inspect_entry(&options, scanner->current_path, scanner->current_path,
+                                           entry->d_name, &inspected);
+    if (inspection < 0) {
+      scanner->failed = true;
+      break;
+    }
+    if (inspection == 0)
      continue;
-    }
-    is_symlink = S_ISLNK(lstats.st_mode);
+    char* cur_path = inspected.path;
+    struct stat stats = inspected.stats;

-    if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links &&
-        !scanner->copy_unsafe_links) {
-      free(cur_path);
-      continue;
-    }
-
-    if (is_symlink && scanner->safe_links) {
-      char link_target[4096];
-      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
-      if (len < 0) {
-        free(cur_path);
-        continue;
-      }
-      link_target[len] = '\0';
-      if (link_target[0] == '/') {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    if (is_symlink && scanner->copy_unsafe_links && !scanner->copy_links) {
-      char link_target[4096];
-      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
-      if (len < 0) {
-        free(cur_path);
-        continue;
-      }
-      link_target[len] = '\0';
-      bool unsafe = (link_target[0] == '/');
-      if (!unsafe) {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    bool use_lstat = is_symlink && scanner->follow_symlinks && !scanner->copy_links;
-    if (use_lstat) {
-      stats = lstats;
-    } else {
-      if (stat(cur_path, &stats) != 0) {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    if (S_ISDIR(stats.st_mode)) {
+    if (inspected.is_directory) {
      int next_depth = scanner->current_depth + 1;
      if (scanner->max_depth <= 0 || next_depth < scanner->max_depth) {
        DirEntry* de = dir_entry_create(cur_path, next_depth);
-        if (!queue_enqueue(scanner->directories, de))
+        if (!de || !queue_enqueue(scanner->directories, de)) {
          dir_entry_destroy(de);
+          scanner->failed = true;
+        }
      }
      free(cur_path);
    } else {
@@ -204,93 +299,88 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
        free(cur_path);
        continue;
      }
-      bool excluded = false;
-      for (int i = 0; i < scanner->exclude_count; i++) {
-        if (glob_match(scanner->exclude_patterns[i], entry->d_name)) {
-          excluded = true;
-          break;
-        }
-      }
-      if (excluded) {
-        free(cur_path);
-        continue;
-      }
-
-      if (scanner->include_count > 0) {
-        bool included = false;
-        for (int i = 0; i < scanner->include_count; i++) {
-          if (glob_match(scanner->include_patterns[i], entry->d_name)) {
-            included = true;
-            break;
-          }
-        }
-        if (!included) {
-          free(cur_path);
-          continue;
-        }
-      }
-
-      if ((scanner->max_size > 0 && (unsigned long long)stats.st_size > scanner->max_size) ||
-          (scanner->min_size > 0 && (unsigned long long)stats.st_size < scanner->min_size)) {
-        free(cur_path);
-        continue;
-      }
-
      File* file = file_create(cur_path);
      if (file == NULL) {
        free(cur_path);
+        scanner->failed = true;
        continue;
      }
      file->data->size = stats.st_size;
      if (scanner->use_metadata)
        file->metadata = file_metadata_create(&stats);
-      array_list_add(chunk_data, file);
+      if (scanner->use_metadata && !file->metadata) {
+        file_destroy(file);
+        free(cur_path);
+        scanner->failed = true;
+        break;
+      }
+      if (!array_list_add(chunk_data, file)) {
+        file_destroy(file);
+        scanner->failed = true;
+        break;
+      }
      chunk_data_size += file->data->size;
      if (chunk_data_size > scanner->chunk_size) {
        free(cur_path);
-        return chunk_data_to_chunk(chunk_data);
+        Chunk* result = chunk_data_to_chunk(chunk_data);
+        if (!result)
+          scanner->failed = true;
+        return result;
      }
      free(cur_path);
    }
  }

-  if (chunk_data->size > 0)
-    return chunk_data_to_chunk(chunk_data);
+  if (chunk_data->size > 0) {
+    Chunk* result = chunk_data_to_chunk(chunk_data);
+    if (!result)
+      scanner->failed = true;
+    return result;
+  }
  array_list_delete(chunk_data);
  return NULL;
 }

+bool directory_scanner_failed(const DirectoryScanner* scanner) {
+  return scanner == NULL || scanner->failed;
+}
+
 typedef struct {
  ParallelScanner* ps;
  char** dirs;
  int dir_count;
-  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;
-  bool checksum;
+  ScannerOptions options;
 } ParallelWorkerArg;

 static int parallel_worker_thread(void* arg) {
  ParallelWorkerArg* wa = (ParallelWorkerArg*)arg;
  for (int i = 0; i < wa->dir_count; i++) {
-    DirectoryScanner* ds = directory_scanner_create(
-        wa->dirs[i], wa->use_metadata, wa->chunk_size, wa->exclude_patterns, wa->exclude_count,
-        wa->include_patterns, wa->include_count, wa->max_size, wa->min_size, wa->max_depth,
-        wa->follow_symlinks, wa->copy_links, wa->safe_links, wa->copy_unsafe_links, wa->checksum);
+    DirectoryScanner* ds = directory_scanner_create_with_options(wa->dirs[i], &wa->options);
+    if (!ds) {
+      mtx_lock(&wa->ps->result_mutex);
+      wa->ps->failed = true;
+      atomic_store(&wa->ps->cancelled, true);
+      cnd_broadcast(&wa->ps->result_not_empty);
+      cnd_broadcast(&wa->ps->result_not_full);
+      mtx_unlock(&wa->ps->result_mutex);
+      break;
+    }
    Chunk* chunk;
    while ((chunk = directory_scanner_next(ds)) != NULL) {
-      queue_enqueue_multithreaded(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
-                                  &wa->ps->result_not_empty, &wa->ps->result_not_full);
+      if (!queue_enqueue_multithreaded_cancel(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
+                                              &wa->ps->result_not_empty, &wa->ps->result_not_full,
+                                              &wa->ps->cancelled)) {
+        chunk_destroy(chunk);
+        break;
+      }
+    }
+    if (directory_scanner_failed(ds)) {
+      mtx_lock(&wa->ps->result_mutex);
+      wa->ps->failed = true;
+      atomic_store(&wa->ps->cancelled, true);
+      cnd_broadcast(&wa->ps->result_not_empty);
+      cnd_broadcast(&wa->ps->result_not_full);
+      mtx_unlock(&wa->ps->result_mutex);
    }
    directory_scanner_destroy(ds);
    free(wa->dirs[i]);
@@ -300,7 +390,7 @@ static int parallel_worker_thread(void* arg) {
  free(wa);
  mtx_lock(&ps->result_mutex);
  ps->completed++;
-  if (ps->completed >= ps->num_threads) {
+  if (ps->completed >= ps->expected_threads) {
    ps->done = true;
    cnd_signal(&ps->result_not_empty);
  }
@@ -308,13 +398,10 @@ static int parallel_worker_thread(void* arg) {
  return thrd_success;
 }

-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, bool checksum) {
+ParallelScanner* parallel_scanner_create_with_options(const char* root_directory,
+                                                      const ScannerOptions* options) {
+  if (!root_directory || !options)
+    return NULL;
  ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
  if (!ps)
    return NULL;
@@ -323,9 +410,29 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
    free(ps);
    return NULL;
  }
-  if (mtx_init(&ps->result_mutex, mtx_plain) != thrd_success ||
-      cnd_init(&ps->result_not_empty) != thrd_success ||
-      cnd_init(&ps->result_not_full) != thrd_success) {
+  atomic_init(&ps->cancelled, false);
+  int init = 0;
+  bool ok = true;
+  if (mtx_init(&ps->result_mutex, mtx_plain) != thrd_success)
+    ok = false;
+  if (ok) {
+    init++;
+    if (cnd_init(&ps->result_not_empty) != thrd_success)
+      ok = false;
+  }
+  if (ok) {
+    // cppcheck-suppress unreadVariable
+    init++;
+    if (cnd_init(&ps->result_not_full) != thrd_success)
+      ok = false;
+  }
+  if (!ok) {
+    if (init >= 3)
+      cnd_destroy(&ps->result_not_full);
+    if (init >= 2)
+      cnd_destroy(&ps->result_not_empty);
+    if (init >= 1)
+      mtx_destroy(&ps->result_mutex);
    queue_destroy(ps->result_queue);
    free(ps);
    return NULL;
@@ -340,137 +447,110 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata

  ArrayList* root_files = array_list_create(file_destroy);
  ArrayList* subdirs = array_list_create(free);
-  struct dirent* entry;
+  if (!root_files || !subdirs) {
+    array_list_delete(root_files);
+    array_list_delete(subdirs);
+    closedir(dir);
+    parallel_scanner_destroy(ps);
+    return NULL;
+  }
+  const struct dirent* entry;
  while ((entry = readdir(dir)) != NULL) {
    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
      continue;
-    char* cur_path = path_cat(root_directory, entry->d_name);
-    if (!cur_path)
-      continue;
-    struct stat lstats;
-    if (lstat(cur_path, &lstats) != 0) {
-      free(cur_path);
+    ScannerEntry inspected;
+    int inspection =
+        scanner_inspect_entry(options, root_directory, root_directory, entry->d_name, &inspected);
+    if (inspection < 0) {
+      ps->failed = true;
      continue;
    }
-    bool is_symlink = S_ISLNK(lstats.st_mode);
-
-    // Skip symlinks unless the user explicitly enabled following/copying them.
-    if (is_symlink && !follow_symlinks && !copy_links && !safe_links && !copy_unsafe_links) {
-      free(cur_path);
+    if (inspection == 0)
      continue;
-    }
-
-    // --safe-links: reject symlinks pointing outside the source tree.
-    if (is_symlink && safe_links) {
-      char link_target[4096];
-      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
-      if (len < 0) {
+    char* cur_path = inspected.path;
+    struct stat st = inspected.stats;
+    if (inspected.is_directory) {
+      if (!array_list_add(subdirs, cur_path)) {
        free(cur_path);
-        continue;
+        ps->failed = true;
      }
-      link_target[len] = 0;
-      if (link_target[0] == '/') {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    // --copy-unsafe-links (without --copy-links): only copy absolute symlinks.
-    if (is_symlink && copy_unsafe_links && !copy_links) {
-      char link_target[4096];
-      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
-      if (len < 0) {
-        free(cur_path);
-        continue;
-      }
-      link_target[len] = 0;
-      bool unsafe = (link_target[0] == '/');
-      if (!unsafe) {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    // Determine whether to use lstat or stat results for the entry.
-    struct stat st;
-    bool use_lstat_res = is_symlink && follow_symlinks && !copy_links;
-    if (use_lstat_res) {
-      st = lstats;
    } else {
-      if (stat(cur_path, &st) != 0) {
-        free(cur_path);
-        continue;
-      }
-    }
-
-    if (S_ISDIR(st.st_mode)) {
-      array_list_add(subdirs, cur_path);
-    } else {
-      bool excluded = false;
-      for (int i = 0; i < exclude_count; i++) {
-        if (glob_match(exclude_patterns[i], entry->d_name)) {
-          excluded = true;
-          break;
-        }
-      }
-      if (excluded) {
-        free(cur_path);
-        continue;
-      }
-      if (include_count > 0) {
-        bool included = false;
-        for (int i = 0; i < include_count; i++) {
-          if (glob_match(include_patterns[i], entry->d_name)) {
-            included = true;
-            break;
-          }
-        }
-        if (!included) {
-          free(cur_path);
-          continue;
-        }
-      }
-      if ((max_size > 0 && (unsigned long long)st.st_size > max_size) ||
-          (min_size > 0 && (unsigned long long)st.st_size < min_size)) {
-        free(cur_path);
-        continue;
-      }
      File* file = file_create(cur_path);
      free(cur_path);
-      if (!file)
+      if (!file) {
+        ps->failed = true;
        continue;
+      }
      file->data->size = st.st_size;
-      if (use_metadata)
+      if (options->use_metadata)
        file->metadata = file_metadata_create(&st);
-      array_list_add(root_files, file);
+      if (options->use_metadata && !file->metadata) {
+        file_destroy(file);
+        ps->failed = true;
+        continue;
+      }
+      if (!array_list_add(root_files, file)) {
+        file_destroy(file);
+        ps->failed = true;
+      }
    }
  }
  closedir(dir);

-  unsigned long long cs = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
+  unsigned long long cs = options->chunk_size > 0 ? options->chunk_size : DESIRED_CHUNK_SIZE;
  if (root_files->size > 0) {
    ArrayList* batch = array_list_create(NULL);
+    if (!batch) {
+      ps->failed = true;
+      array_list_delete(root_files);
+      array_list_delete(subdirs);
+      parallel_scanner_destroy(ps);
+      return NULL;
+    }
    unsigned long long batch_size = 0;
    Chunk* first = NULL;
    for (int i = 0; i < root_files->size; i++) {
      File* f = (File*)root_files->items[i];
-      array_list_add(batch, f);
+      if (!array_list_add(batch, f)) {
+        ps->failed = true;
+        break;
+      }
      batch_size += f->data->size;
      if (batch_size >= cs || i == root_files->size - 1) {
        void** items = array_list_to_array(batch);
+        if (!items) {
+          ps->failed = true;
+          batch->item_destroyer = file_destroy;
+          array_list_delete(batch);
+          batch = NULL;
+          break;
+        }
        Chunk* c = chunk_create((File**)items, batch->size);
        free(items);
+        if (!c) {
+          ps->failed = true;
+          batch->item_destroyer = file_destroy;
+          array_list_delete(batch);
+          batch = NULL;
+          break;
+        }
        batch->item_destroyer = NULL;
        array_list_delete(batch);
        batch = NULL;
        if (!first) {
          first = c;
        } else {
-          queue_enqueue_multithreaded(ps->result_queue, c, &ps->result_mutex, &ps->result_not_empty,
-                                      &ps->result_not_full);
+          if (!queue_enqueue(ps->result_queue, c)) {
+            chunk_destroy(c);
+            ps->failed = true;
+          }
        }
        if (i < root_files->size - 1) {
          batch = array_list_create(NULL);
+          if (!batch) {
+            ps->failed = true;
+            break;
+          }
          batch_size = 0;
        }
      }
@@ -484,12 +564,13 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
  }
  array_list_delete(root_files);

-  int n = num_threads > 0 ? num_threads : 4;
+  int n = options->num_threads > 0 ? options->num_threads : 4;
  if (n > subdirs->size)
    n = subdirs->size > 0 ? subdirs->size : 1;

  if (subdirs->size > 0) {
    ps->num_threads = n;
+    ps->expected_threads = n;
    ps->threads = calloc(n, sizeof(thrd_t));
    if (!ps->threads) {
      array_list_delete(subdirs);
@@ -499,51 +580,77 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
    int dirs_per_thread = subdirs->size / n;
    int remainder = subdirs->size % n;
    int start = 0;
+    ps->num_threads = 0;
    for (int t = 0; t < n; t++) {
      int count = dirs_per_thread + (t < remainder ? 1 : 0);
      if (count == 0)
        break;
      ParallelWorkerArg* wa = calloc(1, sizeof(ParallelWorkerArg));
-      if (!wa)
+      if (!wa) {
+        ps->failed = true;
        break;
+      }
      wa->ps = ps;
      wa->dirs = calloc(count, sizeof(char*));
      if (!wa->dirs) {
        free(wa);
+        ps->failed = true;
        break;
      }
-      for (int j = 0; j < count; j++)
+      bool dup_ok = true;
+      for (int j = 0; j < count; j++) {
        wa->dirs[j] = str_dup((char*)subdirs->items[start + j]);
+        if (!wa->dirs[j])
+          dup_ok = false;
+      }
+      if (!dup_ok) {
+        for (int j = 0; j < count; j++)
+          free(wa->dirs[j]);
+        free(wa->dirs);
+        free(wa);
+        ps->failed = true;
+        break;
+      }
      wa->dir_count = count;
-      wa->use_metadata = use_metadata;
-      wa->chunk_size = cs;
-      wa->exclude_patterns = exclude_patterns;
-      wa->exclude_count = exclude_count;
-      wa->include_patterns = include_patterns;
-      wa->include_count = include_count;
-      wa->max_size = max_size;
-      wa->min_size = min_size;
-      wa->max_depth = max_depth;
-      wa->follow_symlinks = follow_symlinks;
-      wa->copy_links = copy_links;
-      wa->safe_links = safe_links;
-      wa->copy_unsafe_links = copy_unsafe_links;
-      wa->checksum = checksum;
+      wa->options = *options;
+      wa->options.chunk_size = cs;
      start += count;
      if (thrd_create(&ps->threads[t], parallel_worker_thread, wa) != thrd_success) {
        for (int j = 0; j < count; j++)
          free(wa->dirs[j]);
        free(wa->dirs);
        free(wa);
-        ps->num_threads = t;
+        ps->failed = true;
+        atomic_store(&ps->cancelled, true);
+        ps->expected_threads = ps->created_threads;
+        mtx_lock(&ps->result_mutex);
+        cnd_broadcast(&ps->result_not_empty);
+        cnd_broadcast(&ps->result_not_full);
+        mtx_unlock(&ps->result_mutex);
        break;
      }
+      ps->num_threads++;
+      ps->created_threads++;
    }
  }
  array_list_delete(subdirs);
  return ps;
 }

+ParallelScanner* parallel_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,
+                                         int num_threads, bool follow_symlinks, bool copy_links,
+                                         bool safe_links, bool copy_unsafe_links, bool checksum) {
+  ScannerOptions options = {use_metadata,     chunk_size,        exclude_patterns, exclude_count,
+                            include_patterns, include_count,     max_size,         min_size,
+                            max_depth,        num_threads,       follow_symlinks,  copy_links,
+                            safe_links,       copy_unsafe_links, checksum};
+  return parallel_scanner_create_with_options(root_directory, &options);
+}
+
 Chunk* parallel_scanner_next(ParallelScanner* ps) {
  if (ps->initial_chunk) {
    Chunk* c = ps->initial_chunk;
@@ -551,7 +658,9 @@ Chunk* parallel_scanner_next(ParallelScanner* ps) {
    return c;
  }
  if (ps->num_threads == 0) {
+    mtx_lock(&ps->result_mutex);
    ps->done = true;
+    mtx_unlock(&ps->result_mutex);
    return NULL;
  }
  Chunk* chunk = queue_dequeue_multithreaded(
@@ -559,11 +668,19 @@ Chunk* parallel_scanner_next(ParallelScanner* ps) {
  return chunk;
 }

+bool parallel_scanner_failed(const ParallelScanner* ps) {
+  return ps == NULL || ps->failed;
+}
+
 void parallel_scanner_destroy(ParallelScanner* ps) {
  if (!ps)
    return;
+  mtx_lock(&ps->result_mutex);
  ps->done = true;
-  cnd_signal(&ps->result_not_empty);
+  atomic_store(&ps->cancelled, true);
+  cnd_broadcast(&ps->result_not_empty);
+  cnd_broadcast(&ps->result_not_full);
+  mtx_unlock(&ps->result_mutex);
  for (int i = 0; i < ps->num_threads; i++)
    thrd_join(ps->threads[i], NULL);
  free(ps->threads);
@@ -6,6 +6,25 @@
 #include <dirent.h>
 #include <stdbool.h>
 #include <threads.h>
+#include <stdatomic.h>
+
+typedef struct {
+  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;
+  bool checksum;
+} ScannerOptions;

 typedef struct {
  Queue* directories;
@@ -26,6 +45,7 @@ typedef struct {
  bool safe_links;
  bool copy_unsafe_links;
  bool checksum;
+  bool failed;
 } DirectoryScanner;

 typedef struct {
@@ -34,8 +54,12 @@ typedef struct {
  cnd_t result_not_empty;
  cnd_t result_not_full;
  int num_threads;
+  int expected_threads;
+  int created_threads;
  thrd_t* threads;
  bool done;
+  bool failed;
+  atomic_bool cancelled;
  int completed;
  Chunk* initial_chunk;
 } ParallelScanner;
@@ -47,17 +71,23 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
                                           unsigned long long min_size, int max_depth,
                                           bool follow_symlinks, bool copy_links, bool safe_links,
                                           bool copy_unsafe_links, bool checksum);
+DirectoryScanner* directory_scanner_create_with_options(const char* root_directory,
+                                                        const ScannerOptions* options);
 Chunk* directory_scanner_next(DirectoryScanner* scanner);
+bool directory_scanner_failed(const DirectoryScanner* scanner);
 void directory_scanner_destroy(DirectoryScanner* scanner);

-ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata,
+ParallelScanner* parallel_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,
                                         int num_threads, bool follow_symlinks, bool copy_links,
                                         bool safe_links, bool copy_unsafe_links, bool checksum);
+ParallelScanner* parallel_scanner_create_with_options(const char* root_directory,
+                                                      const ScannerOptions* options);
 Chunk* parallel_scanner_next(ParallelScanner* scanner);
+bool parallel_scanner_failed(const ParallelScanner* scanner);
 void parallel_scanner_destroy(ParallelScanner* scanner);

 #endif
@@ -0,0 +1,74 @@
+#include "usage.h"
+#include <stdio.h>
+#include <delta.h>
+#include <chunk.h>
+
+void print_usage(void) {
+  printf("Usage:\n");
+  printf("  fastsync [options] <source> <destination>\n");
+  printf("  fastsync [options] --source-dir <src> --dest-dir <dst>\n");
+  printf("\n");
+  printf("Destination formats:\n");
+  printf("  user@host:/path     SSH transport (rsync-style)\n");
+  printf("  host:/path          SSH transport (current user)\n");
+  printf("  /local/path         TCP transport (requires server on localhost:8080)\n");
+  printf("\n");
+  printf("Options:\n");
+  printf("  -c [level]          Enable compression (level 1-22, default 5)\n");
+  printf("  -z [level]          Alias for -c\n");
+  printf("  -a, --archive       Archive mode (-c -m -M)\n");
+  printf("  -n, --dry-run       Show what would be transferred\n");
+  printf("  -p <port>           SSH port (default: 22)\n");
+  printf("  --progress          Show transfer progress\n");
+  printf("  --delete            Delete files on receiver not in source\n");
+  printf("  --exclude <pattern> Exclude files matching pattern\n");
+  printf("  --include <pattern> Only include files matching pattern\n");
+  printf("  --exclude-from <file> Read exclude patterns from file\n");
+  printf("  --include-from <file> Read include patterns from file\n");
+  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("  --delta             Delta transfer for changed files (requires --incremental)\n");
+  printf("  --delta-block <n>   Delta block size in bytes (default: %d)\n",
+         DELTA_BLOCK_SIZE_DEFAULT);
+  printf("  --delta-max <n>     Max file size for delta transfer (default: %llu)\n",
+         DELTA_MAX_FILE_SIZE);
+  printf("  -m                  Enable multithreading\n");
+  printf("  -s                  Enable chunk serialization\n");
+  printf("  -f                  Enable sendfile (TCP only, not with -c or -s)\n");
+  printf("  -v, --verbose       Enable debug logging\n");
+  printf("  -M, --preserve      Preserve file metadata\n");
+  printf("  --chunk-size <n>    Chunk size in bytes (default: %d)\n", DEFAULT_CHUNK_SIZE);
+  printf("  --source-dir <path> Source directory\n");
+  printf("  --dest-dir <path>   Destination directory\n");
+  printf("  --save-to-disk      Write received files to disk\n");
+  printf("  --server-host <ip>  Server IP address (default: 127.0.0.1)\n");
+  printf("  --server-port <n>   Server port (default: 8080)\n");
+  printf("  --bwlimit <KB/s>    Bandwidth limit in kilobytes per second\n");
+  printf("  --tls               Enable TLS encryption\n");
+  printf("  --cert <path>       TLS certificate file (PEM)\n");
+  printf("  --key <path>        TLS private key file (PEM)\n");
+  printf("  --ca <path>         TLS CA certificate file (PEM)\n");
+  printf("  --timeout <sec>     I/O timeout in seconds (default: 30)\n");
+  printf("  -T <sec>            Alias for --timeout\n");
+  printf("  --contimeout <sec>  Connection timeout in seconds (default: 10)\n");
+  printf("  --backup            Backup existing files before overwriting\n");
+  printf("  --backup-dir <dir>  Directory for backups (requires --backup)\n");
+  printf("  --suffix <str>      Backup suffix (default: ~)\n");
+  printf("  --stats             Print transfer statistics at end\n");
+  printf("  --max-depth <n>     Maximum directory depth (0=unlimited)\n");
+  printf("  --log-file <path>   Write log messages to file\n");
+  printf("  --partial           Keep partial files on interrupted transfer\n");
+  printf("  --partial-dir <dir> Directory for partial files\n");
+  printf("  --fastsync-server-path <path>\n");
+  printf("                      Path to fastsync-server on remote (default: fastsync-server)\n");
+  printf("  -l, --links         Copy symlinks as symlinks\n");
+  printf("  --copy-links        Transform symlinks into referent files\n");
+  printf("  --safe-links        Skip symlinks that point outside transfer tree\n");
+  printf("  --copy-unsafe-links  Only transform unsafe symlinks into referent files\n");
+  printf("  -S, --sparse        Handle sparse files efficiently\n");
+  printf("  --inplace           Update files in-place (no temp+rename)\n");
+  printf("  --compress-level <n>    Compression level (default: 5)\n");
+  printf("  --help              Show this help\n");
+  printf("  -V, --version       Show version\n");
+}
@@ -0,0 +1,6 @@
+#ifndef USAGE_H
+#define USAGE_H
+
+void print_usage(void);
+
+#endif
@@ -0,0 +1,126 @@
+#include "receiver.h"
+
+#include "chunk.h"
+#include "log.h"
+#include "protocol.h"
+#include "utils.h"
+#include <stdlib.h>
+#include <sys/stat.h>
+
+static bool receiver_process_chunk(Chunk* chunk, const ReceiverSink* sink) {
+  for (int i = 0; i < chunk->element_count; i++) {
+    File* file = chunk->items[i];
+    chunk->items[i] = NULL;
+    if (!sink->store_file(file, sink->context)) {
+      chunk_destroy(chunk);
+      return false;
+    }
+  }
+  chunk_destroy(chunk);
+  return true;
+}
+
+static bool receiver_process_batch(Config* config, int file_descriptor) {
+  int count;
+  if (config->checksum || !receive_int(file_descriptor, &count) || count < 0 ||
+      count > MAX_MANIFEST_ENTRIES)
+    return false;
+  for (int i = 0; i < count; i++) {
+    char* check_path = receive_str(file_descriptor);
+    if (!check_path)
+      return false;
+    unsigned long long check_size;
+    long long check_mtime;
+    if (!receive_n_data(file_descriptor, &check_size, sizeof(check_size)) ||
+        !receive_n_data(file_descriptor, &check_mtime, sizeof(check_mtime))) {
+      free(check_path);
+      return false;
+    }
+    if (!utils_valid_batch_path(check_path)) {
+      free(check_path);
+      send_status(file_descriptor, STATUS_ERROR);
+      return false;
+    }
+    char* full_path = path_cat(config->receive_root_directory, check_path);
+    struct stat st;
+    bool has_old = full_path && lstat(full_path, &st) == 0;
+    bool match = 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);
+    free(check_path);
+    if (!sent)
+      return false;
+  }
+  return true;
+}
+
+int receiver_process(Config* config, int file_descriptor, const ReceiverSink* sink) {
+  Status status;
+  if (!receive_status(file_descriptor, &status))
+    return -1;
+  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
+         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
+    if (status == STATUS_KEEPALIVE) {
+      if (!send_status(file_descriptor, STATUS_KEEPALIVE))
+        return -1;
+      goto next;
+    }
+    if (status == STATUS_ABORT) {
+      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
+      return -1;
+    }
+    if (status == STATUS_CHECK) {
+      bool skipped;
+      File* file = receive_incremental_check(file_descriptor, config, &skipped);
+      if (!skipped && (!file || !sink->store_file(file, sink->context)))
+        goto receive_error;
+    } else if (status == STATUS_CHUNK) {
+      Chunk* chunk = receive_chunk_data(file_descriptor, config);
+      if (!chunk || !receiver_process_chunk(chunk, sink))
+        goto receive_error;
+    } else if (status == STATUS_CHECK_BATCH) {
+      if (!receiver_process_batch(config, file_descriptor))
+        return -1;
+      goto next;
+    } else {
+      File* file = file_receive(config, file_descriptor);
+      if (!file) {
+        log_message(LOG_LEVEL_ERROR, "Failed to receive file");
+        goto receive_error;
+      }
+      if (!sink->store_file(file, sink->context))
+        goto receive_error;
+    }
+  next:
+    if (!receive_status(file_descriptor, &status))
+      goto receive_error;
+  }
+  if (status == STATUS_MANIFEST && receive_manifest(file_descriptor, config, &status) != 0)
+    return -1;
+  if (status != STATUS_FINISHED) {
+    log_message(LOG_LEVEL_ERROR, "Did not receive FINISHED Status");
+    goto receive_error;
+  }
+  if (sink->send_success && !send_status(file_descriptor, STATUS_OK))
+    return -1;
+  return 0;
+
+receive_error:
+  if (sink->send_error)
+    send_status(file_descriptor, STATUS_ERROR);
+  return -1;
+}
+
+static bool receiver_save_file(File* file, void* context) {
+  Config* config = context;
+  bool success =
+      !config->save_to_disk || file_save_to_disk(config->receive_root_directory, file, config);
+  file_destroy(file);
+  return success;
+}
+
+int receiver_receive_files(Config* config, int file_descriptor) {
+  ReceiverSink sink = {receiver_save_file, config, true, true};
+  return receiver_process(config, file_descriptor, &sink);
+}
@@ -0,0 +1,19 @@
+#ifndef RECEIVER_H
+#define RECEIVER_H
+
+#include "config.h"
+#include "file.h"
+
+typedef bool (*ReceiverFileSink)(File* file, void* context);
+
+typedef struct {
+  ReceiverFileSink store_file;
+  void* context;
+  bool send_error;
+  bool send_success;
+} ReceiverSink;
+
+int receiver_process(Config* config, int file_descriptor, const ReceiverSink* sink);
+int receiver_receive_files(Config* config, int file_descriptor);
+
+#endif
@@ -1,25 +1,23 @@
-#include "array_list.h"
-#include "chunk.h"
 #include "config.h"
-#include "data.h"
 #include "file.h"
 #include "log.h"
 #include "multiprocessing.h"
-#include "protocol.h"
 #include "queue.h"
+#include "receiver.h"
 #include "transport_tcp.h"
 #include "transport_tls.h"
 #include "unistd.h"
 #include "utils.h"
+#include <fcntl.h>
+#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 #include <sys/stat.h>
-#include <unistd.h>

 static char* authorized_root;
+static int authorized_root_fd = -1;
 static bool allow_delete;

 static bool path_is_within(const char* root, const char* path) {
@@ -32,116 +30,37 @@ static bool __attribute__((unused)) configure_authorization(const char* root) {
  if (!root || !realpath(root, resolved))
    return false;
  authorized_root = str_dup(resolved);
-  return authorized_root != NULL;
-}
-
-int receive_files(Config* config, int fd) {
-  Status status;
-  if (!receive_status(fd, &status))
-    return -1;
-
-  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
-         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
-    if (status == STATUS_KEEPALIVE) {
-      send_status(fd, STATUS_KEEPALIVE);
-      goto next;
-    }
-    if (status == STATUS_ABORT) {
-      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
-      return -1;
-    }
-    if (status == STATUS_CHECK) {
-      bool skipped;
-      File* file = receive_incremental_check(fd, config, &skipped);
-      if (skipped)
-        goto next;
-      if (file == NULL && !skipped)
-        return -1;
-      if (config->save_to_disk)
-        file_save_to_disk(config->receive_root_directory, file, config);
-      file_destroy(file);
-    } else if (status == STATUS_CHUNK) {
-      Chunk* chunk = receive_chunk_data(fd, config);
-      if (chunk == NULL) {
-        send_status(fd, STATUS_ERROR);
-        return -1;
-      }
-      for (int i = 0; i < chunk->element_count; i++) {
-        if (config->save_to_disk)
-          file_save_to_disk(config->receive_root_directory, chunk->items[i], config);
-      }
-      chunk_destroy(chunk);
-    } else if (status == STATUS_CHECK_BATCH) {
-      int count;
-      if (!receive_int(fd, &count))
-        return -1;
-      for (int i = 0; i < count; i++) {
-        char* check_path = receive_str(fd);
-        if (!check_path)
-          return -1;
-        unsigned long long check_size;
-        long long check_mtime;
-        if (!receive_n_data(fd, &check_size, sizeof(check_size)) ||
-            !receive_n_data(fd, &check_mtime, sizeof(check_mtime))) {
-          free(check_path);
-          return -1;
-        }
-        char* full_path = path_cat(config->receive_root_directory, check_path);
-        struct stat st;
-        bool has_old = full_path && lstat(full_path, &st) == 0;
-        bool match = has_old && (unsigned long long)st.st_size == check_size &&
-                     (long long)st.st_mtime == check_mtime;
-        if (match)
-          send_status(fd, STATUS_OK);
-        else
-          send_status(fd, STATUS_NEXT);
-        free(full_path);
-        free(check_path);
-      }
-      goto next;
-    } else {
-      File* file = file_receive(config, fd);
-      if (file == NULL) {
-        log_message(LOG_LEVEL_ERROR, "Failed to receive file");
-        send_status(fd, STATUS_ERROR);
-        return -1;
-      }
-      if (config->save_to_disk)
-        file_save_to_disk(config->receive_root_directory, file, config);
-      file_destroy(file);
-    }
-  next:
-    if (!receive_status(fd, &status)) {
-      send_status(fd, STATUS_ERROR);
-      return -1;
-    }
+  if (!authorized_root)
+    return false;
+  authorized_root_fd = open(resolved, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  if (authorized_root_fd < 0) {
+    free(authorized_root);
+    authorized_root = NULL;
+    return false;
  }
-
-  if (status == STATUS_MANIFEST) {
-    if (receive_manifest(fd, config, &status) != 0)
-      return -1;
-  }
-  if (status != STATUS_FINISHED) {
-    log_message(LOG_LEVEL_ERROR, "Did not receive FINISHED Status");
-    send_status(fd, STATUS_ERROR);
-    return -1;
-  }
-  send_status(fd, STATUS_OK);
-  return 0;
+  file_set_authorized_root(authorized_root_fd, authorized_root);
+  utils_set_authorized_root_fd(authorized_root_fd);
+  return true;
 }

 void handler(int file_descriptor) {
  SSL* ssl = io_get_ssl();
+  ProtocolSession session;
+  protocol_session_init(&session, file_descriptor, file_descriptor);
+  protocol_session_set_ssl(&session, ssl);
+  protocol_session_bind(&session);
  Config* config = config_receive(file_descriptor);
  if (config == NULL) {
    log_message(LOG_LEVEL_ERROR, "Failed to receive config");
    close(file_descriptor);
+    protocol_session_unbind();
    return;
  }
  if (!authorized_root) {
    log_message(LOG_LEVEL_ERROR, "No server-side destination root configured");
    config_delete(config);
    close(file_descriptor);
+    protocol_session_unbind();
    return;
  }
  char resolved_destination[PATH_MAX];
@@ -153,6 +72,7 @@ void handler(int file_descriptor) {
    free(canonical_destination);
    config_delete(config);
    close(file_descriptor);
+    protocol_session_unbind();
    return;
  }
  if (canonical_destination)
@@ -165,6 +85,7 @@ void handler(int file_descriptor) {
  if (!config->receive_root_directory) {
    config_delete(config);
    close(file_descriptor);
+    protocol_session_unbind();
    return;
  }
  config->use_delete = config->use_delete && allow_delete;
@@ -173,6 +94,7 @@ void handler(int file_descriptor) {
    if (q == NULL) {
      config_delete(config);
      close(file_descriptor);
+      protocol_session_unbind();
      return;
    }
    PipelineContextReceiver* context =
@@ -181,27 +103,47 @@ void handler(int file_descriptor) {
      queue_destroy(q);
      config_delete(config);
      close(file_descriptor);
+      protocol_session_unbind();
      return;
    }
    thrd_t receiver, writer;
-    if (thrd_create(&receiver, receive_thread, context) != thrd_success ||
-        thrd_create(&writer, write_thread, context) != thrd_success) {
+    bool receiver_created = thrd_create(&receiver, receive_thread, context) == thrd_success;
+    bool writer_created = false;
+    if (receiver_created)
+      writer_created = thrd_create(&writer, write_thread, context) == thrd_success;
+    if (!receiver_created || !writer_created) {
      perror("Error creating Threads");
+      if (receiver_created) {
+        mtx_lock(&context->mutex);
+        atomic_store(&context->cancelled, true);
+        cnd_broadcast(&context->condition_not_full);
+        cnd_broadcast(&context->condition_not_empty);
+        mtx_unlock(&context->mutex);
+        close(file_descriptor);
+        thrd_join(receiver, NULL);
+      } else {
+        close(file_descriptor);
+      }
+      if (writer_created)
+        thrd_join(writer, NULL);
      pipeline_context_receiver_destroy(context);
-      close(file_descriptor);
+      protocol_session_unbind();
      return;
    }
    int receiver_result;
    int writer_result;
    thrd_join(receiver, &receiver_result);
    thrd_join(writer, &writer_result);
-    if (receiver_result == thrd_success && writer_result == thrd_success)
-      send_status(file_descriptor, STATUS_OK);
+    send_status(file_descriptor, receiver_result == thrd_success && writer_result == thrd_success
+                                     ? STATUS_OK
+                                     : STATUS_ERROR);
    pipeline_context_receiver_destroy(context);
  } else {
-    receive_files(config, file_descriptor);
+    if (receiver_receive_files(config, file_descriptor) != 0)
+      log_message(LOG_LEVEL_ERROR, "Transfer failed");
    config_delete(config);
  }
+  protocol_session_unbind();
  close(file_descriptor);
 }

@@ -210,16 +152,14 @@ static Server* g_server = NULL;

 static void cleanup(int sig) {
  (void)sig;
-  if (g_server) {
+  if (g_server)
    server_delete(&g_server);
-  }
  _exit(0);
 }

 static void print_server_usage(void) {
  printf("FastSync Server\n");
-  printf("Usage: fastsync-server [options]\n");
-  printf("\n");
+  printf("Usage: fastsync-server [options]\n\n");
  printf("Options:\n");
  printf("  --stdio             Run in stdio mode (SSH transport)\n");
  printf("  -p <port>           TCP port (default: 8080, range: 1-65535)\n");
@@ -235,9 +175,7 @@ static void print_server_usage(void) {

 int main(int argc, char* argv[]) {
  bool use_tls = false;
-  char* tls_cert = NULL;
-  char* tls_key = NULL;
-  char* tls_ca = NULL;
+  char *tls_cert = NULL, *tls_key = NULL, *tls_ca = NULL;
  int port = 8080;
  const char* destination_root = ".";
  bool stdio_mode = false;
@@ -277,11 +215,8 @@ int main(int argc, char* argv[]) {
      return 1;
    }
  }
-
-  if (tls_ca && !use_tls) {
+  if (tls_ca && !use_tls)
    log_message(LOG_LEVEL_WARNING, "--ca has no effect without --tls");
-  }
-
  signal(SIGINT, cleanup);
  signal(SIGTERM, cleanup);
  if (!configure_authorization(destination_root)) {
@@ -291,11 +226,14 @@ int main(int argc, char* argv[]) {
  if (stdio_mode) {
    io_set_fds(STDIN_FILENO, STDOUT_FILENO);
    handler(STDIN_FILENO);
+    file_set_authorized_root(-1, NULL);
+    utils_set_authorized_root_fd(-1);
+    close(authorized_root_fd);
    free(authorized_root);
    return 0;
  }
  g_server = server_create(port);
-  if (g_server == NULL) {
+  if (!g_server) {
    log_message(LOG_LEVEL_ERROR, "Failed to create server");
    return 1;
  }
@@ -317,4 +255,4 @@ int main(int argc, char* argv[]) {
  }
  return 0;
 }
-#endif /* !FASTSYNC_SERVER_AS_LIB */
+#endif
@@ -1,12 +1,13 @@
 #include "compression.h"
 #include "data.h"
 #include "log.h"
-#include "stdlib.h"
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 #include <strings.h>
-#include "zstd.h"
+#include <zstd.h>

 #define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
+#define MAX_DECOMPRESSED_SIZE (100ULL * 1024 * 1024) /* 100 MB hard ceiling */

 static const char* SKIP_COMPRESSION_EXTENSIONS[] = {".jpg", ".jpeg", ".png", ".gif", ".mp4", ".mkv",
                                                    ".zip", ".gz",   ".xz",  ".zst", NULL};
@@ -84,6 +85,13 @@ Data* data_decompress(Data* compressed_data) {
    dst_size = compressed_data->size * 3;
    if (dst_size < INITIAL_DECOMPRESS_BUF_SIZE)
      dst_size = INITIAL_DECOMPRESS_BUF_SIZE;
+    if (dst_size > MAX_DECOMPRESSED_SIZE)
+      dst_size = MAX_DECOMPRESSED_SIZE;
+  }
+  if (dst_size > MAX_DECOMPRESSED_SIZE) {
+    log_message(LOG_LEVEL_ERROR, "Declared decompressed size exceeds %llu bytes",
+                (unsigned long long)MAX_DECOMPRESSED_SIZE);
+    return NULL;
  }

  ZSTD_DCtx* dctx = ZSTD_createDCtx();
@@ -113,7 +121,16 @@ Data* data_decompress(Data* compressed_data) {
      return NULL;
    }
    if (ret > 0 && output.pos == output.size) {
+      if (buf_size >= MAX_DECOMPRESSED_SIZE) {
+        log_message(LOG_LEVEL_ERROR, "Decompressed data exceeds %llu bytes",
+                    (unsigned long long)MAX_DECOMPRESSED_SIZE);
+        ZSTD_freeDCtx(dctx);
+        data_destroy(uncompressed_data);
+        return NULL;
+      }
      buf_size *= 2;
+      if (buf_size > MAX_DECOMPRESSED_SIZE)
+        buf_size = MAX_DECOMPRESSED_SIZE;
      void* new_data = realloc(uncompressed_data->data, buf_size);
      if (!new_data) {
        log_message(LOG_LEVEL_ERROR, "Failed to grow decompression buffer");
@@ -8,10 +8,7 @@
 #include <stdlib.h>
 #include <string.h>

-Config* config_create(void) {
-  Config* config = malloc(sizeof(Config));
-  if (!config)
-    return NULL;
+static void config_set_defaults(Config* config) {
  config->version = str_dup(PROTOCOL_VERSION);
  config->send_directory = NULL;
  config->receive_root_directory = NULL;
@@ -101,6 +98,13 @@ Config* config_create(void) {
  config->server_mode = false;
  config->checksum = false;
  config->compress_choice = NULL;
+}
+
+Config* config_create(void) {
+  Config* config = malloc(sizeof(Config));
+  if (!config)
+    return NULL;
+  config_set_defaults(config);
  return config;
 }

@@ -131,6 +135,8 @@ void config_parse_ssh_dest(Config* config) {
 }

 void config_delete(Config* config) {
+  if (config == NULL)
+    return;
  free(config->version);
  free(config->send_directory);
  free(config->receive_root_directory);
@@ -167,92 +173,157 @@ void config_delete(Config* config) {
  free(config);
 }

+/* Each helper is deliberately ordered to match the wire format. Keep the
+ * helper call order in config_send and config_receive unchanged when adding
+ * fields. */
+static bool send_core_fields(int fd, const Config* c) {
+  return send_str(fd, c->version) && send_str(fd, c->send_directory) &&
+         send_str(fd, c->receive_root_directory) && send_int(fd, c->save_to_disk) &&
+         send_int(fd, c->use_multithreading) && send_int(fd, c->use_chunk_serialization) &&
+         send_int(fd, c->use_compression) && send_int(fd, c->use_metadata) &&
+         send_int(fd, c->compression_level) &&
+         send_n_data(fd, &c->chunk_size, sizeof(c->chunk_size)) && send_int(fd, c->use_sendfile);
+}
+
+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_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));
+}
+
+static bool send_file_options(int fd, const Config* c) {
+  return send_int(fd, c->backup) && send_str(fd, c->backup_dir ? c->backup_dir : "") &&
+         send_int(fd, c->follow_symlinks) && send_int(fd, c->copy_links) &&
+         send_int(fd, c->safe_links) && send_int(fd, c->copy_unsafe_links) &&
+         send_int(fd, c->preserve_hard_links) && send_int(fd, c->preserve_acls) &&
+         send_int(fd, c->preserve_xattrs) && send_int(fd, c->preserve_devices) &&
+         send_int(fd, c->preserve_sparse);
+}
+
+static bool send_selection_options(int fd, const Config* c) {
+  return send_int(fd, c->update) && send_int(fd, c->inplace) && send_int(fd, c->append) &&
+         send_int(fd, c->append_verify) && send_int(fd, c->delete_excluded) &&
+         send_int(fd, c->delete_after) && send_n_data(fd, &c->max_delete, sizeof(c->max_delete)) &&
+         send_int(fd, c->relative) && send_int(fd, c->prune_empty_dirs);
+}
+
+static bool send_resume_options(int fd, const Config* c) {
+  return send_str(fd, c->temp_dir ? c->temp_dir : "") && send_int(fd, c->partial) &&
+         send_str(fd, c->partial_dir ? c->partial_dir : "") &&
+         send_str(fd, c->suffix ? c->suffix : "") && send_int(fd, c->delete_before) &&
+         send_int(fd, c->checksum) && send_str(fd, c->compress_choice ? c->compress_choice : "");
+}
+
+static bool receive_core_fields(int fd, Config* c) {
+  int value;
+  c->send_directory = receive_str(fd);
+  c->receive_root_directory = receive_str(fd);
+  if (!c->send_directory || !c->receive_root_directory)
+    return false;
+  if (!receive_int(fd, &value))
+    return false;
+  c->save_to_disk = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_multithreading = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_chunk_serialization = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_compression = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_metadata = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->compression_level = value;
+  if (!receive_n_data(fd, &c->chunk_size, sizeof(c->chunk_size)))
+    return false;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_sendfile = value;
+  return true;
+}
+
+static bool receive_delta_fields(int fd, Config* c) {
+  int value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_delete = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_incremental = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->use_delta = value;
+  return receive_n_data(fd, &c->delta_block_size, sizeof(c->delta_block_size)) &&
+         receive_n_data(fd, &c->delta_max_file_size, sizeof(unsigned long long));
+}
+
+static bool receive_file_options(int fd, Config* c) {
+  int value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->backup = value;
+  c->backup_dir = receive_str(fd);
+  if (!c->backup_dir)
+    return false;
+  bool* flags[] = {&c->follow_symlinks,   &c->copy_links,          &c->safe_links,
+                   &c->copy_unsafe_links, &c->preserve_hard_links, &c->preserve_acls,
+                   &c->preserve_xattrs,   &c->preserve_devices,    &c->preserve_sparse};
+  for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+    if (!receive_int(fd, &value))
+      return false;
+    *flags[i] = value;
+  }
+  return true;
+}
+
+static bool receive_selection_options(int fd, Config* c) {
+  int value;
+  bool* flags[] = {&c->update,        &c->inplace,         &c->append,
+                   &c->append_verify, &c->delete_excluded, &c->delete_after};
+  for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+    if (!receive_int(fd, &value))
+      return false;
+    *flags[i] = value;
+  }
+  if (!receive_n_data(fd, &c->max_delete, sizeof(c->max_delete)))
+    return false;
+  if (!receive_int(fd, &value))
+    return false;
+  c->relative = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->prune_empty_dirs = value;
+  return true;
+}
+
+static bool receive_resume_options(int fd, Config* c) {
+  int value;
+  c->temp_dir = receive_str(fd);
+  if (!c->temp_dir || !receive_int(fd, &value))
+    return false;
+  c->partial = value;
+  c->partial_dir = receive_str(fd);
+  c->suffix = c->partial_dir ? receive_str(fd) : NULL;
+  if (!c->partial_dir || !c->suffix || !receive_int(fd, &value))
+    return false;
+  c->delete_before = value;
+  if (!receive_int(fd, &value))
+    return false;
+  c->checksum = value;
+  c->compress_choice = receive_str(fd);
+  return c->compress_choice != NULL;
+}
+
 bool config_send(int file_descriptor, const Config* config) {
-  if (!send_str(file_descriptor, config->version))
-    return false;
-  if (!send_str(file_descriptor, config->send_directory))
-    return false;
-  if (!send_str(file_descriptor, config->receive_root_directory))
-    return false;
-  if (!send_int(file_descriptor, config->save_to_disk))
-    return false;
-  if (!send_int(file_descriptor, config->use_multithreading))
-    return false;
-  if (!send_int(file_descriptor, config->use_chunk_serialization))
-    return false;
-  if (!send_int(file_descriptor, config->use_compression))
-    return false;
-  if (!send_int(file_descriptor, config->use_metadata))
-    return false;
-  if (!send_int(file_descriptor, config->compression_level))
-    return false;
-  if (!send_n_data(file_descriptor, &config->chunk_size, sizeof(config->chunk_size)))
-    return false;
-  if (!send_int(file_descriptor, config->use_sendfile))
-    return false;
-  if (!send_int(file_descriptor, config->use_delete))
-    return false;
-  if (!send_int(file_descriptor, config->use_incremental))
-    return false;
-  if (!send_int(file_descriptor, config->use_delta))
-    return false;
-  if (!send_int(file_descriptor, (int)config->delta_block_size))
-    return false;
-  if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
-    return false;
-  if (!send_int(file_descriptor, config->backup))
-    return false;
-  if (!send_str(file_descriptor, config->backup_dir ? config->backup_dir : ""))
-    return false;
-  if (!send_int(file_descriptor, config->follow_symlinks))
-    return false;
-  if (!send_int(file_descriptor, config->copy_links))
-    return false;
-  if (!send_int(file_descriptor, config->safe_links))
-    return false;
-  if (!send_int(file_descriptor, config->copy_unsafe_links))
-    return false;
-  if (!send_int(file_descriptor, config->preserve_hard_links))
-    return false;
-  if (!send_int(file_descriptor, config->preserve_acls))
-    return false;
-  if (!send_int(file_descriptor, config->preserve_xattrs))
-    return false;
-  if (!send_int(file_descriptor, config->preserve_devices))
-    return false;
-  if (!send_int(file_descriptor, config->preserve_sparse))
-    return false;
-  if (!send_int(file_descriptor, config->update))
-    return false;
-  if (!send_int(file_descriptor, config->inplace))
-    return false;
-  if (!send_int(file_descriptor, config->append))
-    return false;
-  if (!send_int(file_descriptor, config->append_verify))
-    return false;
-  if (!send_int(file_descriptor, config->delete_excluded))
-    return false;
-  if (!send_int(file_descriptor, config->delete_after))
-    return false;
-  if (!send_n_data(file_descriptor, &config->max_delete, sizeof(config->max_delete)))
-    return false;
-  if (!send_int(file_descriptor, config->relative))
-    return false;
-  if (!send_int(file_descriptor, config->prune_empty_dirs))
-    return false;
-  if (!send_str(file_descriptor, config->temp_dir ? config->temp_dir : ""))
-    return false;
-  if (!send_int(file_descriptor, config->partial))
-    return false;
-  if (!send_str(file_descriptor, config->partial_dir ? config->partial_dir : ""))
-    return false;
-  if (!send_str(file_descriptor, config->suffix ? config->suffix : ""))
-    return false;
-  if (!send_int(file_descriptor, config->delete_before))
-    return false;
-  if (!send_int(file_descriptor, config->checksum))
-    return false;
-  if (!send_str(file_descriptor, config->compress_choice ? config->compress_choice : ""))
+  if (!send_core_fields(file_descriptor, config) || !send_delta_fields(file_descriptor, config) ||
+      !send_file_options(file_descriptor, config) ||
+      !send_selection_options(file_descriptor, config) ||
+      !send_resume_options(file_descriptor, config))
    return false;
  Status status;
  if (!receive_status(file_descriptor, &status))
@@ -265,209 +336,24 @@ bool config_send(int file_descriptor, const Config* config) {
 }

 Config* config_receive(int file_descriptor) {
-  Config* config = (Config*)malloc(sizeof(Config));
-  if (config == NULL)
+  Config* config = config_create();
+  if (!config)
    return NULL;
-  memset(config, 0, sizeof(*config));
+  free(config->version);
  config->version = receive_str(file_descriptor);
-  if (!config->version) {
-    free(config);
-    return NULL;
-  }
+  if (!config->version)
+    goto error;
  if (strcmp(config->version, PROTOCOL_VERSION) != 0) {
    fprintf(stderr, "Protocol version mismatch: client=%s, server=%s\n", config->version,
            PROTOCOL_VERSION);
-    free(config->version);
-    free(config);
    send_status(file_descriptor, STATUS_ERROR);
-    return NULL;
+    goto error;
  }
-  config->send_directory = receive_str(file_descriptor);
-  if (!config->send_directory) {
-    free(config->version);
-    free(config);
-    return NULL;
-  }
-  config->receive_root_directory = receive_str(file_descriptor);
-  if (!config->receive_root_directory) {
-    free(config->version);
-    free(config->send_directory);
-    free(config);
-    return NULL;
-  }
-  int tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->save_to_disk = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_multithreading = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_chunk_serialization = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_compression = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_metadata = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->compression_level = tmp;
-  if (!receive_n_data(file_descriptor, &config->chunk_size, sizeof(config->chunk_size)))
-    goto error;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_sendfile = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_delete = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_incremental = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->use_delta = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->delta_block_size = (uint32_t)tmp;
-  if (!receive_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
-    goto error;
-  config->show_progress = false;
-  config->dry_run = false;
-  config->ssh_port = 22;
-  config->transport = TRANSPORT_TCP;
-  config->ssh_destination = NULL;
-  config->fastsync_server_path = NULL;
-  config->exclude_patterns = NULL;
-  config->exclude_count = 0;
-  config->include_patterns = NULL;
-  config->include_count = 0;
-  config->max_size = 0;
-  config->min_size = 0;
-  config->use_tls = false;
-  config->tls_cert = NULL;
-  config->tls_key = NULL;
-  config->tls_ca = NULL;
-  config->timeout = 30;
-  config->contimeout = 10;
-  config->quiet = false;
-  config->stats = false;
-  config->max_depth = 0;
-  config->log_file = NULL;
-  config->queue_size = 100;
-  config->follow_symlinks = false;
-  config->copy_links = false;
-  config->safe_links = false;
-  config->copy_unsafe_links = false;
-  config->preserve_hard_links = false;
-  config->preserve_acls = false;
-  config->preserve_xattrs = false;
-  config->preserve_devices = false;
-  config->preserve_sparse = false;
-  config->itemize_changes = false;
-  config->out_format = NULL;
-  config->info_level = 0;
-  config->debug_level = 0;
-  config->list_only = false;
-  config->human_readable = false;
-  config->update = false;
-  config->inplace = false;
-  config->append = false;
-  config->append_verify = false;
-  config->delete_excluded = false;
-  config->delete_after = false;
-  config->max_delete = 0;
-  config->filters = NULL;
-  config->files_from = NULL;
-  config->cvs_exclude = false;
-  config->prune_empty_dirs = false;
-  config->relative = false;
-  config->rsh_command = NULL;
-  config->rsync_path = NULL;
-  config->temp_dir = NULL;
-  config->compare_dest = NULL;
-  config->copy_dest = NULL;
-  config->link_dest = NULL;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->backup = tmp;
-  config->backup_dir = receive_str(file_descriptor);
-  if (config->backup_dir == NULL)
-    goto error;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->follow_symlinks = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->copy_links = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->safe_links = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->copy_unsafe_links = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->preserve_hard_links = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->preserve_acls = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->preserve_xattrs = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->preserve_devices = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->preserve_sparse = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->update = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->inplace = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->append = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->append_verify = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->delete_excluded = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->delete_after = tmp;
-  if (!receive_n_data(file_descriptor, &config->max_delete, sizeof(config->max_delete)))
-    goto error;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->relative = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->prune_empty_dirs = tmp;
-  config->temp_dir = receive_str(file_descriptor);
-  if (config->temp_dir == NULL)
-    goto error;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->partial = tmp;
-  config->partial_dir = receive_str(file_descriptor);
-  if (config->partial_dir == NULL)
-    goto error;
-  config->suffix = receive_str(file_descriptor);
-  if (config->suffix == NULL)
-    goto error;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->delete_before = tmp;
-  if (!receive_int(file_descriptor, &tmp))
-    goto error;
-  config->checksum = tmp;
-  config->compress_choice = receive_str(file_descriptor);
-  if (config->compress_choice == NULL)
+  if (!receive_core_fields(file_descriptor, config) ||
+      !receive_delta_fields(file_descriptor, config) ||
+      !receive_file_options(file_descriptor, config) ||
+      !receive_selection_options(file_descriptor, config) ||
+      !receive_resume_options(file_descriptor, config))
    goto error;
  if (config->compress_choice[0] != '\0' && strcmp(config->compress_choice, "zstd") != 0 &&
      strcmp(config->compress_choice, "none") != 0) {
@@ -475,29 +361,11 @@ Config* config_receive(int file_descriptor) {
    send_status(file_descriptor, STATUS_ERROR);
    goto error;
  }
-  config->address = NULL;
-  config->bind_address = NULL;
-  config->ipv6 = false;
-  config->ipv4 = false;
-  config->daemon = false;
-  config->daemon_config = NULL;
-  config->server_mode = false;
-  config->server_host = str_dup("127.0.0.1");
-  config->server_port = 8080;
  if (!send_status(file_descriptor, STATUS_OK))
    goto error;
  return config;

 error:
-  free(config->version);
-  free(config->send_directory);
-  free(config->receive_root_directory);
-  free(config->server_host);
-  free(config->backup_dir);
-  free(config->temp_dir);
-  free(config->partial_dir);
-  free(config->suffix);
-  free(config->compress_choice);
-  free(config);
+  config_delete(config);
  return NULL;
 }
@@ -392,6 +392,10 @@ Delta* delta_deserialize(const Data* data) {

    if (type == DELTA_OP_BLOCK_MATCH) {
      if (pos + sizeof(uint32_t) * 3 > data->size) {
+        for (uint32_t k = 0; k < i; k++) {
+          if (delta->instructions[k].type == DELTA_INSTR_LITERAL)
+            free(delta->instructions[k].literal.data);
+        }
        free(delta->instructions);
        free(delta);
        return NULL;
@@ -430,6 +434,11 @@ Delta* delta_deserialize(const Data* data) {
      }
      delta->instructions[i].literal.data = malloc(lit_len);
      if (!delta->instructions[i].literal.data) {
+        log_message(LOG_LEVEL_ERROR, "Failed to allocate %u bytes for literal data", lit_len);
+        for (uint32_t k = 0; k < i; k++) {
+          if (delta->instructions[k].type == DELTA_INSTR_LITERAL)
+            free(delta->instructions[k].literal.data);
+        }
        free(delta->instructions);
        free(delta);
        return NULL;
@@ -453,7 +462,8 @@ Delta* delta_deserialize(const Data* data) {

 void* delta_apply(const void* old_data, uint64_t old_size, const Delta* delta,
                  uint32_t block_size) {
-  if (!old_data || !delta)
+  if (!old_data || !delta || (delta->new_file_size > 0 && delta->instructions == NULL) ||
+      (delta->instruction_count > 0 && block_size == 0))
    return NULL;

  void* output = malloc((size_t)delta->new_file_size);
@@ -467,10 +477,15 @@ void* delta_apply(const void* old_data, uint64_t old_size, const Delta* delta,
  for (uint32_t i = 0; i < delta->instruction_count; i++) {
    if (delta->instructions[i].type == DELTA_INSTR_BLOCK_MATCH) {
      uint64_t src_offset = (uint64_t)delta->instructions[i].match.block_index * block_size;
+      if (src_offset > UINT64_MAX - delta->instructions[i].match.block_offset) {
+        free(output);
+        return NULL;
+      }
      src_offset += delta->instructions[i].match.block_offset;
      uint32_t len = delta->instructions[i].match.length;

-      if (src_offset + len > old_size) {
+      if (src_offset > old_size || (uint64_t)len > old_size - src_offset ||
+          out_pos > delta->new_file_size || (uint64_t)len > delta->new_file_size - out_pos) {
        free(output);
        return NULL;
      }
@@ -478,6 +493,10 @@ void* delta_apply(const void* old_data, uint64_t old_size, const Delta* delta,
      out_pos += len;
    } else {
      uint32_t len = delta->instructions[i].literal.length;
+      if (out_pos > delta->new_file_size || (uint64_t)len > delta->new_file_size - out_pos) {
+        free(output);
+        return NULL;
+      }
      memcpy(out + out_pos, delta->instructions[i].literal.data, len);
      out_pos += len;
    }
@@ -3,6 +3,7 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
+#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,6 +11,7 @@
 #include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <time.h>

 #include "compression.h"
 #include "delta.h"
@@ -17,7 +19,7 @@
 #include "config.h"
 #include "data.h"
 #include "file.h"
-#include "log.h"
+#include "file_store.h"
 #include "metadata.h"
 #include "protocol.h"
 #include "utils.h"
@@ -36,6 +38,8 @@ bool file_checksum(File* file, uint64_t* checksum) {
 }

 File* file_create(const char* path) {
+  if (!path)
+    return NULL;
  File* file = (File*)malloc(sizeof(File));
  if (file == NULL) {
    perror("ERROR: Could not allocate memory for file struct");
@@ -101,6 +105,8 @@ bool file_load_data(File* file) {
  if (file == NULL)
    return false;
  if (file->data->data == NULL) {
+    if (file->data->size == 0)
+      return true;
    file->data->data = malloc(file->data->size);
    if (file->data->data == NULL) {
      perror("Could not allocate memory for file data");
@@ -110,6 +116,9 @@ bool file_load_data(File* file) {
  size_t bytes_read = file_content_to_buffer(file);
  if (bytes_read != file->data->size) {
    log_message(LOG_LEVEL_ERROR, "Did not read expected amount of bytes from file");
+    free(file->data->data);
+    file->data->data = NULL;
+    file->data->size = 0;
    return false;
  }
  return true;
@@ -117,6 +126,8 @@ bool file_load_data(File* file) {

 bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
                            int compression_level, bool send_path) {
+  if (!file || !file->path || !file->data)
+    return false;
  const Data* data_to_send = file->data;
  Data* compressed_data = NULL;
  if (compression_level > 0 && !compression_should_skip(file->path)) {
@@ -143,22 +154,47 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
  return true;
 }

-bool file_save_to_disk(const char* root_directory, File* file, const Config* config) {
+void file_set_authorized_root(int fd, const char* canonical_path) {
+  file_store_set_authorized_root(fd, canonical_path);
+}
+
+static bool path_is_within_root(const char* root, const char* path) {
+  size_t n = strlen(root);
+  return strncmp(root, path, n) == 0 && (path[n] == '\0' || path[n] == '/');
+}
+
+bool file_save_to_disk(const char* root_directory, const File* file, const Config* config) {
  bool backup_enabled = config && config->backup;
  bool inplace = config && config->inplace;
  bool sparse = config && config->preserve_sparse;
  const char* backup_suffix = (config && config->suffix) ? config->suffix : "~";
  const char* backup_dir = (config && config->backup_dir) ? config->backup_dir : NULL;
  const char* partial_dir = (config && config->partial_dir) ? config->partial_dir : NULL;
+  char *confined_backup = NULL, *confined_partial = NULL;

-  if (has_path_traversal(file->path)) {
-    log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
+  if (!file || !file->path || !file->data || has_path_traversal(file->path) ||
+      (backup_enabled &&
+       (!backup_suffix || backup_suffix[0] == '\0' || strchr(backup_suffix, '/') != NULL ||
+        strcmp(backup_suffix, ".") == 0 || strcmp(backup_suffix, "..") == 0))) {
+    log_message(LOG_LEVEL_ERROR, "Invalid file or path received");
+    return false;
+  }
+
+  /* These options arrive from the client.  They are names below the server
+     root, never independent filesystem roots. */
+  if ((backup_dir && (backup_dir[0] == '/' || has_path_traversal(backup_dir))) ||
+      (partial_dir && (partial_dir[0] == '/' || has_path_traversal(partial_dir))))
+    return false;
+  if (backup_dir && !(confined_backup = path_cat(root_directory, backup_dir)))
+    return false;
+  if (partial_dir && !(confined_partial = path_cat(root_directory, partial_dir))) {
+    free(confined_backup);
    return false;
  }

  char* resolved_root = NULL;
  const char* actual_root =
-      (partial_dir && config && config->partial) ? partial_dir : root_directory;
+      (partial_dir && config && config->partial) ? confined_partial : root_directory;
  resolved_root = realpath(actual_root, NULL);
  if (resolved_root == NULL) {
    if (mkdir_r(actual_root)) {
@@ -167,11 +203,24 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
  }
  if (resolved_root == NULL) {
    log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", actual_root);
+    free(confined_backup);
+    free(confined_partial);
    return false;
  }
+  char* resolved_base = realpath(root_directory, NULL);
+  if (resolved_base == NULL || !path_is_within_root(resolved_base, resolved_root)) {
+    free(resolved_base);
+    free(confined_backup);
+    free(confined_partial);
+    free(resolved_root);
+    return false;
+  }
+  free(resolved_base);

  char* disk_path = path_cat(resolved_root, file->path);
  if (disk_path == NULL) {
+    free(confined_backup);
+    free(confined_partial);
    free(resolved_root);
    return false;
  }
@@ -182,6 +231,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
    if (stat(disk_path, &destination_stat) == 0 && file->metadata &&
        destination_stat.st_mtime > file->metadata->mtime_sec) {
      free(resolved_root);
+      free(confined_backup);
+      free(confined_partial);
      free(disk_path);
      return true;
    }
@@ -192,13 +243,16 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
    if (stat(disk_path, &backup_stat) == 0) {
      char* backup_path = NULL;
      if (backup_dir) {
-        char* resolved_backup_dir = realpath(backup_dir, NULL);
+        char* resolved_backup_dir = realpath(confined_backup, NULL);
        if (!resolved_backup_dir) {
-          mkdir_r(backup_dir);
-          resolved_backup_dir = realpath(backup_dir, NULL);
+          mkdir_r(confined_backup);
+          resolved_backup_dir = realpath(confined_backup, NULL);
        }
        if (resolved_backup_dir) {
-          backup_path = path_cat(resolved_backup_dir, file->path);
+          char* backup_base = realpath(root_directory, NULL);
+          if (backup_base && path_is_within_root(backup_base, resolved_backup_dir))
+            backup_path = path_cat(resolved_backup_dir, file->path);
+          free(backup_base);
          free(resolved_backup_dir);
        }
      }
@@ -218,7 +272,14 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
          mkdir_r(bdir);
          free(backup_dir_path);
        }
-        rename(disk_path, backup_path);
+        if (!file_store_rename_secure(disk_path, backup_path)) {
+          free(backup_path);
+          free(resolved_root);
+          free(confined_backup);
+          free(confined_partial);
+          free(disk_path);
+          return false;
+        }
        free(backup_path);
      }
    }
@@ -226,6 +287,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con

  char* dir_dup = str_dup(disk_path);
  if (!dir_dup) {
+    free(confined_backup);
+    free(confined_partial);
    free(resolved_root);
    free(disk_path);
    return false;
@@ -233,6 +296,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
  char* dir_str = dirname(dir_dup);
  if (!mkdir_r(dir_str)) {
    free(dir_dup);
+    free(confined_backup);
+    free(confined_partial);
    free(resolved_root);
    free(disk_path);
    return false;
@@ -241,6 +306,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
  free(dir_dup);
  if (resolved_dir == NULL) {
    log_message(LOG_LEVEL_ERROR, "Failed to resolve directory for: %s", disk_path);
+    free(confined_backup);
+    free(confined_partial);
    free(resolved_root);
    free(disk_path);
    return false;
@@ -251,6 +318,8 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
      (resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) {
    log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, actual_root);
    free(resolved_dir);
+    free(confined_backup);
+    free(confined_partial);
    free(resolved_root);
    free(disk_path);
    return false;
@@ -258,31 +327,14 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
  free(resolved_dir);
  free(resolved_root);

-  bool ok = to_disk(disk_path, file->data->data, file->data->size, inplace, sparse);
-  if (ok)
-    file_restore_metadata(disk_path, file->metadata);
+  bool ok = file_store_write_secure(disk_path, file->data->data, file->data->size, inplace, sparse,
+                                    file->metadata);
+  free(confined_backup);
+  free(confined_partial);
  free(disk_path);
  return ok;
 }

-static void* old_data_from_path(const char* full_path, unsigned long long old_size) {
-  void* data = malloc((size_t)old_size);
-  if (!data)
-    return NULL;
-  FILE* fp = fopen(full_path, "rb");
-  if (!fp) {
-    free(data);
-    return NULL;
-  }
-  size_t nread = fread(data, 1, (size_t)old_size, fp);
-  fclose(fp);
-  if (nread != (size_t)old_size) {
-    free(data);
-    return NULL;
-  }
-  return data;
-}
-
 static File* receive_delta_file(int fd, const Config* config, const char* check_path,
                                void* old_data, unsigned long long old_size) {
  if (!old_data)
@@ -468,22 +520,53 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {

  char* full_path = path_cat(config->receive_root_directory, check_path);
  struct stat st;
-  bool has_old_file = (full_path && lstat(full_path, &st) == 0);
+  bool has_old_file = false;
+  int old_fd = -1;
+  if (full_path) {
+    char* leaf = NULL;
+    int parent_fd = file_store_open_secure_parent(full_path, &leaf);
+    if (parent_fd >= 0) {
+      old_fd = openat(parent_fd, leaf, O_RDONLY | O_CLOEXEC | O_NOFOLLOW);
+      free(leaf);
+      close(parent_fd);
+      has_old_file = old_fd >= 0 && fstat(old_fd, &st) == 0 && S_ISREG(st.st_mode);
+    }
+  }
  unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;
+  void* old_data = NULL;
+  if (has_old_file && old_size > 0) {
+    old_data = malloc((size_t)old_size);
+    if (old_data) {
+      size_t got = 0;
+      while (got < (size_t)old_size) {
+        ssize_t n = read(old_fd, (char*)old_data + got, (size_t)old_size - got);
+        if (n <= 0) {
+          free(old_data);
+          old_data = NULL;
+          break;
+        }
+        got += (size_t)n;
+      }
+    }
+  }
+  if (old_fd >= 0) {
+    close(old_fd);
+  }

  bool match = has_old_file && (unsigned long long)st.st_size == check_size;
  if (match && config->checksum) {
-    void* old_data = old_size > 0 ? old_data_from_path(full_path, old_size) : NULL;
    uint64_t old_checksum = old_size == 0 ? delta_xxhash64("", 0) : 0;
    if (old_data)
      old_checksum = delta_xxhash64(old_data, (size_t)old_size);
    match = (old_size == 0 || old_data) && old_checksum == check_checksum;
    free(old_data);
+    old_data = NULL;
  } else if (match) {
    match = (long long)st.st_mtime == check_mtime;
  }

  if (match) {
+    free(old_data);
    if (!send_status(fd, STATUS_OK)) {
      free(full_path);
      free(check_path);
@@ -499,13 +582,15 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
                   delta_should_attempt(old_size, check_size, config->delta_max_file_size);

  if (try_delta) {
-    void* old_data = old_data_from_path(full_path, old_size);
    File* delta_file = receive_delta_file(fd, config, check_path, old_data, old_size);
+    old_data = NULL; /* receive_delta_file consumes the snapshot on every path */
    if (delta_file) {
      free(full_path);
      free(check_path);
      return delta_file;
    }
+    free(old_data);
+    old_data = NULL;
    try_delta = false;
  }

@@ -558,211 +643,17 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
  return file;
 }

-static int open_secure_parent(const char* path, char** leaf_out) {
-  char* copy = str_dup(path);
-  if (!copy)
-    return -1;
-  char* parent = dirname(copy);
-  const char* slash = strrchr(path, '/');
-  char* leaf = str_dup(slash ? slash + 1 : path);
-  if (!leaf) {
-    free(copy);
-    return -1;
-  }
-  int fd = (parent[0] == '/') ? open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC)
-                              : open(".", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
-  if (fd < 0) {
-    free(copy);
-    free(leaf);
-    return -1;
-  }
-  char* save = NULL;
-  char* component = strtok_r(parent, "/", &save);
-  while (component) {
-    if (strcmp(component, ".") != 0 && strcmp(component, "..") != 0) {
-      int next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
-      if (next < 0 && errno == ENOENT && mkdirat(fd, component, 0755) == 0)
-        next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
-      if (next < 0) {
-        close(fd);
-        free(copy);
-        free(leaf);
-        return -1;
-      }
-      close(fd);
-      fd = next;
-    }
-    component = strtok_r(NULL, "/", &save);
-  }
-  free(copy);
-  *leaf_out = leaf;
-  return fd;
-}
-
-static bool write_all(int fd, const void* data, unsigned long long size) {
-  const unsigned char* p = data;
-  unsigned long long done = 0;
-  while (done < size) {
-    ssize_t n = write(fd, p + done, (size_t)(size - done));
-    if (n < 0 && errno == EINTR)
-      continue;
-    if (n <= 0)
-      return false;
-    done += (unsigned long long)n;
-  }
-  return true;
-}
-
-static bool to_disk_secure(const char* path, const void* data, unsigned long long data_size,
-                           bool inplace, bool sparse) {
-  char* leaf = NULL;
-  int dirfd = open_secure_parent(path, &leaf);
-  if (dirfd < 0)
-    return false;
-  int fd = -1;
-  bool ok = false;
-  if (inplace) {
-    fd = openat(dirfd, leaf, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW, 0644);
-    if (fd >= 0) {
-      if (!sparse || data_size == 0 || ftruncate(fd, (off_t)data_size) == 0)
-        ok = write_all(fd, data, data_size);
-    }
-  } else {
-    char tmp[NAME_MAX];
-    for (unsigned int i = 0; i < 100 && !ok; ++i) {
-      snprintf(tmp, sizeof(tmp), ".%s.tmp.%ld.%u", leaf, (long)getpid(), i);
-      fd = openat(dirfd, tmp, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC | O_NOFOLLOW, 0600);
-      if (fd < 0)
-        continue;
-      if (sparse && data_size > 0)
-        ok = ftruncate(fd, (off_t)data_size) == 0;
-      if (ok || (!sparse || data_size == 0))
-        ok = write_all(fd, data, data_size);
-      if (close(fd) != 0)
-        ok = false;
-      fd = -1;
-      if (ok && renameat(dirfd, tmp, dirfd, leaf) != 0)
-        ok = false;
-      if (!ok)
-        unlinkat(dirfd, tmp, 0);
-    }
-  }
-  if (fd >= 0)
-    close(fd);
-  close(dirfd);
-  free(leaf);
-  return ok;
-}
-
 bool to_disk(const char* path, const void* data, unsigned long long data_size, bool inplace,
             bool sparse) {
  if (!path || (!data && data_size != 0) || has_path_traversal(path))
    return false;
-  return to_disk_secure(path, data, data_size, inplace, sparse);
-  /* Kept below only as historical context; all writes use descriptor-relative operations. */
-  char* tmp_path = NULL;
-  char* directory = NULL;
-
-  char* path_dup = str_dup(path);
-  if (!path_dup)
-    return false;
-  const char* dir_result = dirname(path_dup);
-  directory = str_dup(dir_result);
-  free(path_dup);
-  if (!directory)
-    return false;
-
-  bool ok = true;
-  if (!mkdir_r(directory))
-    goto done;
-
-  if (inplace) {
-    FILE* file_pointer = fopen(path, "wb");
-    if (file_pointer == NULL) {
-      perror("Could not open file for inplace write");
-      ok = false;
-      goto done;
-    }
-    if (sparse && data_size > 0) {
-      if (fseek(file_pointer, data_size - 1, SEEK_SET) != 0) {
-        perror("Failed to seek for sparse file");
-        fclose(file_pointer);
-        ok = false;
-        goto done;
-      }
-      if (fwrite("", 1, 1, file_pointer) != 1) {
-        perror("Failed to write sparse file");
-        fclose(file_pointer);
-        ok = false;
-        goto done;
-      }
-      rewind(file_pointer);
-    }
-    if (data_size > 0 && fwrite(data, 1, data_size, file_pointer) != data_size) {
-      perror("Failed to write all data to file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    fclose(file_pointer);
-    free(directory);
-    return true;
-  }
-
-  size_t path_len = strlen(path);
-  tmp_path = malloc(path_len + 5);
-  if (!tmp_path) {
-    ok = false;
-    goto done;
-  }
-  memcpy(tmp_path, path, path_len);
-  memcpy(tmp_path + path_len, ".tmp", 5);
-
-  FILE* file_pointer = fopen(tmp_path, "wb");
-  if (file_pointer == NULL) {
-    perror("Could not open temporary file");
-    ok = false;
-    goto done;
-  }
-  if (sparse && data_size > 0) {
-    if (fseek(file_pointer, data_size - 1, SEEK_SET) != 0) {
-      perror("Failed to seek for sparse file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    if (fwrite("", 1, 1, file_pointer) != 1) {
-      perror("Failed to write sparse file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    rewind(file_pointer);
-  }
-  if (fwrite(data, 1, data_size, file_pointer) != data_size) {
-    perror("Failed to write all data to temporary file");
-    fclose(file_pointer);
-    unlink(tmp_path);
-    ok = false;
-    goto done;
-  }
-  fclose(file_pointer);
-
-  if (rename(tmp_path, path) != 0) {
-    perror("Failed to atomically rename temporary file");
-    unlink(tmp_path);
-    ok = false;
-    goto done;
-  }
-
-done:
-  free(tmp_path);
-  free(directory);
-  return ok;
+  return file_store_write_secure(path, data, data_size, inplace, sparse, NULL);
 }

 bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
                        bool send_path) {
+  if (!file || !file->path || !file->data)
+    return false;
  if (compression_level > 0)
    return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
                                  send_path);
@@ -779,13 +670,56 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
  }

  unsigned long long file_size = file->data->size;
+  struct stat source_stat;
+  if (fstat(fd, &source_stat) != 0 || !S_ISREG(source_stat.st_mode) ||
+      (unsigned long long)source_stat.st_size < file_size) {
+    close(fd);
+    return false;
+  }
  if (!send_n_data(file_descriptor, &file_size, sizeof(unsigned long long))) {
    close(fd);
    return false;
  }

+  /* sendfile cannot encrypt TLS records.  Keep the framing identical but
+     route encrypted transfers through the deadline-aware IO layer. */
+  if (io_get_ssl() != NULL) {
+    unsigned char buffer[64 * 1024];
+    unsigned long long remaining = file_size;
+    bool ok = true;
+    while (remaining > 0) {
+      size_t want = remaining > sizeof(buffer) ? sizeof(buffer) : (size_t)remaining;
+      ssize_t got = read(fd, buffer, want);
+      if (got <= 0 || !send_n_data(file_descriptor, buffer, (size_t)got)) {
+        ok = false;
+        break;
+      }
+      remaining -= (unsigned long long)got;
+    }
+    close(fd);
+    return ok;
+  }
+
  off_t offset = 0;
+  struct timespec deadline;
+  clock_gettime(CLOCK_MONOTONIC, &deadline);
+  deadline.tv_sec += 60;
  while ((unsigned long long)offset < file_size) {
+    struct timespec now;
+    clock_gettime(CLOCK_MONOTONIC, &now);
+    long long remaining = (long long)(deadline.tv_sec - now.tv_sec) * 1000LL +
+                          (deadline.tv_nsec - now.tv_nsec) / 1000000LL;
+    if (remaining <= 0) {
+      close(fd);
+      return false;
+    }
+    struct pollfd pfd = {.fd = file_descriptor, .events = POLLOUT};
+    int timeout = remaining > INT_MAX ? INT_MAX : (int)remaining;
+    int polled = poll(&pfd, 1, timeout);
+    if (polled <= 0 || (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))) {
+      close(fd);
+      return false;
+    }
    ssize_t sent = sendfile(file_descriptor, fd, &offset, file_size - offset);
    if (sent == -1) {
      if (errno == EAGAIN || errno == EINTR)
@@ -794,6 +728,10 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
      close(fd);
      return false;
    }
+    if (sent == 0) {
+      close(fd);
+      return false;
+    }
  }

  close(fd);
@@ -857,6 +795,8 @@ size_t file_content_to_buffer(File* file) {
 }

 int receive_manifest(int fd, const Config* config, int* next_status) {
+  int received_status = STATUS_ERROR;
+  int* status_out = next_status ? next_status : &received_status;
  int count;
  if (!receive_int(fd, &count))
    return -1;
@@ -865,18 +805,30 @@ int receive_manifest(int fd, const Config* config, int* next_status) {
  ArrayList* manifest = array_list_create(free);
  if (!manifest)
    return -1;
+  size_t manifest_bytes = 0;
  for (int i = 0; i < count; i++) {
    char* s = receive_str(fd);
-    if (!s || s[0] == '\0' || has_path_traversal(s) || !array_list_add(manifest, s)) {
+    size_t entry_size = s ? strlen(s) : 0;
+    if (!s || s[0] == '\0' || s[0] == '/' || has_path_traversal(s) ||
+        entry_size > MAX_MANIFEST_BYTES - manifest_bytes ||
+        (manifest_bytes += entry_size) > MAX_MANIFEST_BYTES || !array_list_add(manifest, s)) {
      free(s);
      array_list_delete(manifest);
      return -1;
    }
  }
-  fprintf(stderr, "Deleting files not in manifest...\n");
-  delete_extras(config->receive_root_directory, manifest);
-  array_list_delete(manifest);
-  if (!receive_status(fd, next_status))
+  if (!receive_status(fd, status_out)) {
+    array_list_delete(manifest);
    return -1;
-  return 0;
+  }
+  /* Deletion is a commit operation: never perform it until the sender has
+     completed the manifest frame successfully. */
+  if (*status_out != STATUS_FINISHED || !config->use_delete) {
+    array_list_delete(manifest);
+    return *status_out == STATUS_FINISHED ? 0 : -1;
+  }
+  fprintf(stderr, "Deleting files not in manifest...\n");
+  bool deletion_ok = delete_extras(config->receive_root_directory, manifest);
+  array_list_delete(manifest);
+  return deletion_ok ? 0 : -1;
 }
@@ -37,7 +37,8 @@ FileMetadata* file_metadata_create(const struct stat* stats);
 void file_metadata_destroy(void* metadata);
 bool to_disk(const char* path, const void* data, unsigned long long data_size, bool inplace,
             bool sparse);
-bool file_save_to_disk(const char* root_directory, File* file, const Config* config);
+bool file_save_to_disk(const char* root_directory, const File* file, const Config* config);
+void file_set_authorized_root(int fd, const char* canonical_path);
 File* receive_incremental_check(int fd, const Config* config, bool* skipped);
 int receive_manifest(int fd, const Config* config, int* next_status);

@@ -0,0 +1,159 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "file_store.h"
+#include "metadata.h"
+#include "utils.h"
+
+static int authorized_root_fd = -1;
+static char* authorized_root_path;
+
+static bool path_is_within_root(const char* root, const char* path) {
+  size_t root_length = strlen(root);
+  return strncmp(root, path, root_length) == 0 &&
+         (path[root_length] == '\0' || path[root_length] == '/');
+}
+
+void file_store_set_authorized_root(int fd, const char* canonical_path) {
+  authorized_root_fd = fd;
+  free(authorized_root_path);
+  authorized_root_path = canonical_path ? str_dup(canonical_path) : NULL;
+}
+
+int file_store_open_secure_parent(const char* path, char** leaf_out) {
+  char* copy = str_dup(path);
+  if (!copy)
+    return -1;
+  char* parent = dirname(copy);
+  const char* slash = strrchr(path, '/');
+  char* leaf = str_dup(slash ? slash + 1 : path);
+  if (!leaf) {
+    free(copy);
+    return -1;
+  }
+  int fd;
+  if (authorized_root_fd >= 0 && authorized_root_path && path[0] == '/' &&
+      path_is_within_root(authorized_root_path, path)) {
+    fd = dup(authorized_root_fd);
+    size_t root_length = strlen(authorized_root_path);
+    char* relative = str_dup(path + root_length);
+    if (!relative) {
+      free(copy);
+      free(leaf);
+      close(fd);
+      return -1;
+    }
+    free(copy);
+    copy = relative;
+    parent = dirname(copy);
+  } else {
+    fd = (parent[0] == '/') ? open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC)
+                            : open(".", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  }
+  if (fd < 0) {
+    free(copy);
+    free(leaf);
+    return -1;
+  }
+  char* save = NULL;
+  char* component = strtok_r(parent, "/", &save);
+  while (component) {
+    if (strcmp(component, ".") != 0 && strcmp(component, "..") != 0) {
+      int next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
+      if (next < 0 && errno == ENOENT && mkdirat(fd, component, 0755) == 0)
+        next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
+      if (next < 0) {
+        close(fd);
+        free(copy);
+        free(leaf);
+        return -1;
+      }
+      close(fd);
+      fd = next;
+    }
+    component = strtok_r(NULL, "/", &save);
+  }
+  free(copy);
+  *leaf_out = leaf;
+  return fd;
+}
+
+bool file_store_rename_secure(const char* old_path, const char* new_path) {
+  char *old_leaf = NULL, *new_leaf = NULL;
+  int old_parent = file_store_open_secure_parent(old_path, &old_leaf);
+  int new_parent = file_store_open_secure_parent(new_path, &new_leaf);
+  bool ok = old_parent >= 0 && new_parent >= 0 &&
+            renameat(old_parent, old_leaf, new_parent, new_leaf) == 0;
+  if (old_parent >= 0)
+    close(old_parent);
+  if (new_parent >= 0)
+    close(new_parent);
+  free(old_leaf);
+  free(new_leaf);
+  return ok;
+}
+
+static bool write_all(int fd, const void* data, unsigned long long size) {
+  const unsigned char* p = data;
+  unsigned long long done = 0;
+  while (done < size) {
+    ssize_t n = write(fd, p + done, (size_t)(size - done));
+    if (n < 0 && errno == EINTR)
+      continue;
+    if (n <= 0)
+      return false;
+    done += (unsigned long long)n;
+  }
+  return true;
+}
+
+bool file_store_write_secure(const char* path, const void* data, unsigned long long data_size,
+                             bool inplace, bool sparse, const FileMetadata* metadata) {
+  char* leaf = NULL;
+  int dirfd = file_store_open_secure_parent(path, &leaf);
+  if (dirfd < 0)
+    return false;
+  int fd = -1;
+  bool ok = false;
+  if (inplace) {
+    fd = openat(dirfd, leaf, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW, 0644);
+    if (fd >= 0) {
+      if (!sparse || data_size == 0 || ftruncate(fd, (off_t)data_size) == 0)
+        ok = write_all(fd, data, data_size);
+      if (ok && metadata)
+        ok = file_restore_metadata_fd(fd, metadata);
+    }
+  } else {
+    char tmp[NAME_MAX];
+    for (unsigned int i = 0; i < 100 && !ok; ++i) {
+      snprintf(tmp, sizeof(tmp), ".%s.tmp.%ld.%u", leaf, (long)getpid(), i);
+      fd = openat(dirfd, tmp, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC | O_NOFOLLOW, 0600);
+      if (fd < 0)
+        continue;
+      if (sparse && data_size > 0)
+        ok = ftruncate(fd, (off_t)data_size) == 0;
+      if (ok || (!sparse || data_size == 0))
+        ok = write_all(fd, data, data_size);
+      if (ok && metadata)
+        ok = file_restore_metadata_fd(fd, metadata);
+      if (close(fd) != 0)
+        ok = false;
+      fd = -1;
+      if (ok && renameat(dirfd, tmp, dirfd, leaf) != 0)
+        ok = false;
+      if (!ok)
+        unlinkat(dirfd, tmp, 0);
+    }
+  }
+  if (fd >= 0)
+    close(fd);
+  close(dirfd);
+  free(leaf);
+  return ok;
+}
@@ -0,0 +1,13 @@
+#ifndef FILE_STORE_H
+#define FILE_STORE_H
+
+#include "file.h"
+#include <stdbool.h>
+
+void file_store_set_authorized_root(int fd, const char* canonical_path);
+int file_store_open_secure_parent(const char* path, char** leaf_out);
+bool file_store_rename_secure(const char* old_path, const char* new_path);
+bool file_store_write_secure(const char* path, const void* data, unsigned long long data_size,
+                             bool inplace, bool sparse, const FileMetadata* metadata);
+
+#endif
@@ -15,28 +15,38 @@ void log_set_file(FILE* fp) {
  log_fp = fp;
 }

+static inline void write_message(FILE* dest_io, LogLevel log_level, struct tm t, const char* format,
+                                 va_list args) {
+  fprintf(dest_io, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t.tm_year + 1900, t.tm_mon + 1,
+          t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, log_level_strings[log_level]);
+
+  vfprintf(dest_io, format, args);
+  fprintf(dest_io, "\n");
+}
+
 void log_message(LogLevel log_level, const char* format, ...) {
  if (log_level < current_log_level)
    return;
+  if (log_level < 0 || log_level >= (int)(sizeof(log_level_strings) / sizeof(log_level_strings[0])))
+    return;
  time_t now = time(NULL);
-  const struct tm* t = localtime(&now);
+  struct tm t;
+  if (!localtime_r(&now, &t))
+    return;

-  fprintf(stderr, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1,
-          t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]);
+  FILE* dest_io = stdout;
+  if (log_level == LOG_LEVEL_ERROR) {
+    dest_io = stderr;
+  }

  va_list args;
  va_start(args, format);
-  vfprintf(stderr, format, args);
+  write_message(dest_io, log_level, t, format, args);
  va_end(args);
-  fprintf(stderr, "\n");

  if (log_fp) {
-    fprintf(log_fp, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1,
-            t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]);
    va_start(args, format);
-    vfprintf(log_fp, format, args);
+    write_message(log_fp, log_level, t, format, args);
    va_end(args);
-    fprintf(log_fp, "\n");
-    fflush(log_fp);
  }
 }
@@ -172,13 +172,13 @@ FileMetadata* metadata_receive(int file_descriptor, int* ok) {
  return m;
 }

-void file_restore_metadata(const char* path, FileMetadata* metadata) {
+void file_restore_metadata(const char* path, const FileMetadata* metadata) {
  if (metadata == NULL)
    return;
  if (chmod(path, metadata->mode & 07777 & ~(S_ISUID | S_ISGID)) != 0)
    log_message(LOG_LEVEL_WARNING, "Failed to chmod %s: %s", path, strerror(errno));
-  if (chown(path, metadata->uid, metadata->gid) != 0)
-    log_message(LOG_LEVEL_WARNING, "Failed to chown %s: %s", path, strerror(errno));
+  /* Never apply client-supplied ownership.  The descriptor API below is the
+     receiver write path; retain this legacy API only for compatibility. */
  struct timespec times[2];
  times[0].tv_sec = 0;
  times[0].tv_nsec = UTIME_OMIT;
@@ -187,3 +187,17 @@ void file_restore_metadata(const char* path, FileMetadata* metadata) {
  if (utimensat(AT_FDCWD, path, times, 0) != 0)
    log_message(LOG_LEVEL_WARNING, "Failed to set timestamps on %s: %s", path, strerror(errno));
 }
+
+bool file_restore_metadata_fd(int fd, const FileMetadata* metadata) {
+  if (fd < 0 || metadata == NULL)
+    return metadata == NULL;
+  bool ok = true;
+  if (fchmod(fd, metadata->mode & 07777 & ~(S_ISUID | S_ISGID)) != 0)
+    ok = false;
+  /* Client uid/gid values are deliberately not authoritative. */
+  struct timespec times[2] = {{.tv_sec = 0, .tv_nsec = UTIME_OMIT},
+                              {.tv_sec = metadata->mtime_sec, .tv_nsec = metadata->mtime_nsec}};
+  if (futimens(fd, times) != 0)
+    ok = false;
+  return ok;
+}
@@ -29,6 +29,7 @@ void metadata_to_buf(char** buf, const FileMetadata* m);
 FileMetadata* metadata_from_buf(char** buf);
 bool metadata_send(int file_descriptor, FileMetadata* m);
 FileMetadata* metadata_receive(int file_descriptor, int* ok);
-void file_restore_metadata(const char* path, FileMetadata* metadata);
+void file_restore_metadata(const char* path, const FileMetadata* metadata);
+bool file_restore_metadata_fd(int fd, const FileMetadata* metadata);

 #endif
@@ -1,4 +1,6 @@
 #include "multiprocessing.h"
+#include "receiver.h"
+
 #include "array_list.h"
 #include "chunk.h"
 #include "config.h"
@@ -26,18 +28,48 @@ PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* que
  context->manifest = NULL;
  context->progress_bytes = 0;
  context->sender_done = false;
-  if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success ||
-      cnd_init(&context->condition_not_full_scanner) != thrd_success ||
-      cnd_init(&context->condition_not_empty_scanner) != thrd_success ||
-      mtx_init(&context->mutex_loader, mtx_plain) != thrd_success ||
-      cnd_init(&context->condition_not_full_loader) != thrd_success ||
-      mtx_init(&context->mutex_progress, mtx_plain) != thrd_success ||
-      cnd_init(&context->condition_not_empty_loader) != thrd_success) {
-    perror("Error initializing synchronization objects");
-    free(context);
-    return NULL;
-  }
+  atomic_init(&context->cancelled, false);
+  int init = 0;
+  if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_full_scanner) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_empty_scanner) != thrd_success)
+    goto fail;
+  init++;
+  if (mtx_init(&context->mutex_loader, mtx_plain) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_full_loader) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_empty_loader) != thrd_success)
+    goto fail;
+  init++;
+  if (mtx_init(&context->mutex_progress, mtx_plain) != thrd_success)
+    goto fail;
+  // cppcheck-suppress unreadVariable
+  init++;
  return context;
+
+fail:
+  perror("Error initializing synchronization objects");
+  if (init >= 6)
+    cnd_destroy(&context->condition_not_empty_loader);
+  if (init >= 5)
+    cnd_destroy(&context->condition_not_full_loader);
+  if (init >= 4)
+    mtx_destroy(&context->mutex_loader);
+  if (init >= 3)
+    cnd_destroy(&context->condition_not_empty_scanner);
+  if (init >= 2)
+    cnd_destroy(&context->condition_not_full_scanner);
+  if (init >= 1)
+    mtx_destroy(&context->mutex_scanner);
+  free(context);
+  return NULL;
 }

 void pipeline_context_sender_destroy(PipelineContextSender* context) {
@@ -66,15 +98,33 @@ PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue*
  context->queue = queue;
  context->file_descriptor = file_descriptor;
  context->ssl = ssl;
+  protocol_session_init(&context->session, file_descriptor, file_descriptor);
+  protocol_session_set_ssl(&context->session, ssl);
  context->receiver_done = false;
-  if (mtx_init(&context->mutex, mtx_plain) != thrd_success ||
-      cnd_init(&context->condition_not_full) != thrd_success ||
-      cnd_init(&context->condition_not_empty) != thrd_success) {
-    perror("Error initializing synchronization objects");
-    free(context);
-    return NULL;
-  }
+  atomic_init(&context->cancelled, false);
+  int init = 0;
+  if (mtx_init(&context->mutex, mtx_plain) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_full) != thrd_success)
+    goto fail;
+  init++;
+  if (cnd_init(&context->condition_not_empty) != thrd_success)
+    goto fail;
+  // cppcheck-suppress unreadVariable
+  init++;
  return context;
+
+fail:
+  perror("Error initializing synchronization objects");
+  if (init >= 3)
+    cnd_destroy(&context->condition_not_empty);
+  if (init >= 2)
+    cnd_destroy(&context->condition_not_full);
+  if (init >= 1)
+    mtx_destroy(&context->mutex);
+  free(context);
+  return NULL;
 }

 void pipeline_context_receiver_destroy(PipelineContextReceiver* context) {
@@ -86,24 +136,19 @@ void pipeline_context_receiver_destroy(PipelineContextReceiver* context) {
  free(context);
 }

-static bool receive_chunk_enqueue(int file_descriptor, PipelineContextReceiver* context) {
-  Chunk* chunk = receive_chunk_data(file_descriptor, context->config);
-  if (chunk == NULL)
-    return false;
-
-  for (int i = 0; i < chunk->element_count; i++) {
-    File* file = chunk->items[i];
-    chunk->items[i] = NULL;
-    queue_enqueue_multithreaded(context->queue, file, &context->mutex,
-                                &context->condition_not_empty, &context->condition_not_full);
-  }
-  chunk_destroy(chunk);
-  return true;
+static bool receiver_enqueue_file(File* file, void* context_pointer) {
+  PipelineContextReceiver* context = context_pointer;
+  if (queue_enqueue_multithreaded_cancel(context->queue, file, &context->mutex,
+                                         &context->condition_not_empty,
+                                         &context->condition_not_full, &context->cancelled))
+    return true;
+  file_destroy(file);
+  return false;
 }

 static void receiver_thread_fail(PipelineContextReceiver* context) {
  mtx_lock(&context->mutex);
-  context->cancelled = true;
+  atomic_store(&context->cancelled, true);
  context->receiver_done = true;
  cnd_broadcast(&context->condition_not_empty);
  cnd_broadcast(&context->condition_not_full);
@@ -111,103 +156,29 @@ static void receiver_thread_fail(PipelineContextReceiver* context) {
 }

 int receive_thread(void* pipeline_context) {
-#define RECEIVE_THREAD_FAIL()                                                                      \
-  do {                                                                                             \
-    receiver_thread_fail(context);                                                                 \
-    return thrd_error;                                                                             \
-  } while (0)
  PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
-  if (context->ssl)
-    io_set_ssl(context->ssl);
+  protocol_session_bind(&context->session);
  mtx_lock(&context->mutex);
  int file_descriptor = context->file_descriptor;
  const Config* config = context->config;
  mtx_unlock(&context->mutex);

-  Status status;
-  if (!receive_status(file_descriptor, &status))
-    RECEIVE_THREAD_FAIL();
-  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
-         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
-    if (status == STATUS_KEEPALIVE) {
-      if (!send_status(file_descriptor, STATUS_KEEPALIVE))
-        RECEIVE_THREAD_FAIL();
-      goto next;
-    }
-    if (status == STATUS_ABORT) {
-      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
-      RECEIVE_THREAD_FAIL();
-    }
-    if (status == STATUS_CHECK) {
-      bool skipped;
-      File* file = receive_incremental_check(file_descriptor, config, &skipped);
-      if (!skipped) {
-        if (file == NULL)
-          RECEIVE_THREAD_FAIL();
-        queue_enqueue_multithreaded(context->queue, file, &context->mutex,
-                                    &context->condition_not_empty, &context->condition_not_full);
-      }
-    } else if (status == STATUS_CHUNK) {
-      if (!receive_chunk_enqueue(file_descriptor, context))
-        RECEIVE_THREAD_FAIL();
-    } else if (status == STATUS_CHECK_BATCH) {
-      int count;
-      if (!receive_int(file_descriptor, &count))
-        RECEIVE_THREAD_FAIL();
-      for (int i = 0; i < count; i++) {
-        char* check_path = receive_str(file_descriptor);
-        if (!check_path)
-          RECEIVE_THREAD_FAIL();
-        unsigned long long check_size;
-        long long check_mtime;
-        if (!receive_n_data(file_descriptor, &check_size, sizeof(check_size)) ||
-            !receive_n_data(file_descriptor, &check_mtime, sizeof(check_mtime))) {
-          free(check_path);
-          RECEIVE_THREAD_FAIL();
-        }
-        char* full_path = path_cat(config->receive_root_directory, check_path);
-        struct stat st;
-        bool has_old = full_path && lstat(full_path, &st) == 0;
-        bool match = has_old && (unsigned long long)st.st_size == check_size &&
-                     (long long)st.st_mtime == check_mtime;
-        if (!send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT))
-          RECEIVE_THREAD_FAIL();
-        free(full_path);
-        free(check_path);
-      }
-      goto next;
-    } else {
-      File* file = file_receive(config, file_descriptor);
-      if (file) {
-        queue_enqueue_multithreaded(context->queue, file, &context->mutex,
-                                    &context->condition_not_empty, &context->condition_not_full);
-      } else {
-        log_message(LOG_LEVEL_ERROR, "Failed to receive file");
-        RECEIVE_THREAD_FAIL();
-      }
-    }
-  next:
-    if (!receive_status(file_descriptor, &status))
-      RECEIVE_THREAD_FAIL();
+  ReceiverSink sink = {receiver_enqueue_file, context, false, false};
+  if (receiver_process((Config*)config, file_descriptor, &sink) != 0) {
+    receiver_thread_fail(context);
+    protocol_session_unbind();
+    return thrd_error;
  }
-  if (status == STATUS_MANIFEST) {
-    if (receive_manifest(file_descriptor, config, &status) != 0)
-      RECEIVE_THREAD_FAIL();
-  }
-  if (status != STATUS_FINISHED)
-    RECEIVE_THREAD_FAIL();
  mtx_lock(&context->mutex);
  context->receiver_done = true;
  cnd_signal(&context->condition_not_empty);
  mtx_unlock(&context->mutex);
-#undef RECEIVE_THREAD_FAIL
+  protocol_session_unbind();
  return thrd_success;
 }

 int write_thread(void* pipeline_context) {
  PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
-  if (context->ssl)
-    io_set_ssl(context->ssl);
  mtx_lock(&context->mutex);
  bool save_to_disk = context->config->save_to_disk;
  char* root_directory = str_dup(context->config->receive_root_directory);
@@ -221,8 +192,17 @@ int write_thread(void* pipeline_context) {
      free(root_directory);
      return thrd_success;
    }
-    if (save_to_disk)
-      file_save_to_disk(root_directory, file, context->config);
+    if (save_to_disk && !file_save_to_disk(root_directory, file, context->config)) {
+      file_destroy(file);
+      mtx_lock(&context->mutex);
+      atomic_store(&context->cancelled, true);
+      context->receiver_done = true;
+      cnd_broadcast(&context->condition_not_full);
+      cnd_broadcast(&context->condition_not_empty);
+      mtx_unlock(&context->mutex);
+      free(root_directory);
+      return thrd_error;
+    }
    file_destroy(file);
  }
 }
@@ -2,6 +2,7 @@
 #define MULTIPROCESSING_H

 #include <threads.h>
+#include <stdatomic.h>

 #include "array_list.h"
 #include "config.h"
@@ -26,7 +27,7 @@ typedef struct {
  mtx_t mutex_progress;
  unsigned long long progress_bytes;
  bool sender_done;
-  bool cancelled;
+  atomic_bool cancelled;
 } PipelineContextSender;

 typedef struct PipelineContextReceiver {
@@ -34,11 +35,12 @@ typedef struct PipelineContextReceiver {
  Config* config;
  int file_descriptor;
  SSL* ssl;
+  ProtocolSession session;
  mtx_t mutex;
  cnd_t condition_not_full;
  cnd_t condition_not_empty;
  bool receiver_done;
-  bool cancelled;
+  atomic_bool cancelled;
 } PipelineContextReceiver;

 PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
@@ -7,64 +7,118 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <threads.h>
 #include <time.h>
 #include <unistd.h>

-#define MAX_DATA_SIZE (100ULL * 1024 * 1024)          /* 100 MB max per data message */
-#define RECEIVE_TIMEOUT_SEC 60                        /* 60 second per-message timeout */
+#define RECEIVE_TIMEOUT_SEC 60 /* 60 second per-message timeout */
+#define SEND_TIMEOUT_SEC 60
 #define MAX_CONNECTION_MEMORY (1024ULL * 1024 * 1024) /* 1 GB total per connection */

 static __thread int io_read_fd = -1;
 static __thread int io_write_fd = -1;
 static __thread SSL* io_ssl;
+static __thread ProtocolSession* bound_session;

 static unsigned long long io_bwlimit = 0;
 static long long bw_tokens = 0;
 static struct timespec bw_last_refill = {0, 0};
+static mtx_t bw_mutex;
+static once_flag bw_mutex_once = ONCE_FLAG_INIT;

 static __thread unsigned long long total_allocated_bytes = 0;

 void io_set_fds(int read_fd, int write_fd) {
+  bound_session = NULL;
  io_read_fd = read_fd;
  io_write_fd = write_fd;
+  /* A descriptor switch starts a new transport; never reuse a TLS object
+     belonging to a previous connection or test pipe. */
+  io_ssl = NULL;
+  total_allocated_bytes = 0;
+}
+
+void protocol_session_init(ProtocolSession* session, int read_fd, int write_fd) {
+  if (!session)
+    return;
+  memset(session, 0, sizeof(*session));
+  session->read_fd = read_fd;
+  session->write_fd = write_fd;
+  if (io_bwlimit)
+    protocol_session_set_bwlimit(session, io_bwlimit);
+}
+
+void protocol_session_bind(ProtocolSession* session) {
+  bound_session = session;
+}
+
+void protocol_session_unbind(void) {
+  bound_session = NULL;
+}
+
+void protocol_session_set_ssl(ProtocolSession* session, SSL* ssl) {
+  if (session)
+    session->ssl = ssl;
+}
+
+static void bw_mutex_init(void) {
+  mtx_init(&bw_mutex, mtx_plain);
 }

 void io_set_bwlimit(unsigned long long bytes_per_sec) {
+  call_once(&bw_mutex_once, bw_mutex_init);
+  mtx_lock(&bw_mutex);
  io_bwlimit = bytes_per_sec;
  bw_tokens = (long long)io_bwlimit;
  clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
+  mtx_unlock(&bw_mutex);
 }

-static void bw_throttle(size_t bytes_written) {
-  if (io_bwlimit == 0)
+void protocol_session_set_bwlimit(ProtocolSession* session, unsigned long long bytes_per_sec) {
+  if (!session)
+    return;
+  session->bwlimit = bytes_per_sec;
+  session->bw_tokens = (long long)bytes_per_sec;
+  struct timespec now;
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  session->bw_last_refill_sec = now.tv_sec;
+  session->bw_last_refill_nsec = now.tv_nsec;
+}
+
+static void bw_throttle_session(ProtocolSession* session, size_t bytes_written) {
+  if (session->bwlimit == 0)
    return;

  struct timespec now;
  clock_gettime(CLOCK_MONOTONIC, &now);

-  long long elapsed_ns =
-      (now.tv_sec - bw_last_refill.tv_sec) * 1000000000LL + (now.tv_nsec - bw_last_refill.tv_nsec);
-  bw_last_refill = now;
+  long long elapsed_ns = (now.tv_sec - session->bw_last_refill_sec) * 1000000000LL +
+                         (now.tv_nsec - session->bw_last_refill_nsec);
+  session->bw_last_refill_sec = now.tv_sec;
+  session->bw_last_refill_nsec = now.tv_nsec;

-  long long tokens_to_add = (long long)((double)io_bwlimit * elapsed_ns / 1000000000.0);
-  bw_tokens += tokens_to_add;
-  if (bw_tokens > (long long)io_bwlimit)
-    bw_tokens = (long long)io_bwlimit;
+  long long tokens_to_add = (long long)((double)session->bwlimit * elapsed_ns / 1000000000.0);
+  session->bw_tokens += tokens_to_add;
+  if (session->bw_tokens > (long long)session->bwlimit)
+    session->bw_tokens = (long long)session->bwlimit;

-  bw_tokens -= (long long)bytes_written;
+  session->bw_tokens -= bytes_written;

-  if (bw_tokens < 0) {
-    long long deficit_us = (long long)((double)(-bw_tokens) / io_bwlimit * 1000000.0);
+  if (session->bw_tokens < 0) {
+    long long deficit_us =
+        (long long)((double)(-session->bw_tokens) / session->bwlimit * 1000000.0);
    if (deficit_us >= 1000)
      poll(NULL, 0, (int)(deficit_us / 1000));
    else
      usleep((useconds_t)deficit_us);
-    bw_tokens = 0;
-    clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
+    session->bw_tokens = 0;
+    session->bw_last_refill_sec = now.tv_sec;
+    session->bw_last_refill_nsec = now.tv_nsec;
  }
 }

 void io_set_ssl(SSL* ssl) {
+  bound_session = NULL;
  io_ssl = ssl;
 }

@@ -72,8 +126,32 @@ SSL* io_get_ssl(void) {
  return io_ssl;
 }

-static int io_fd(int dir_fd, int file_descriptor) {
-  return (dir_fd != -1) ? dir_fd : file_descriptor;
+static ProtocolSession* legacy_session(void) {
+  static __thread ProtocolSession session;
+  if (bound_session)
+    return bound_session;
+  session.read_fd = io_read_fd;
+  session.write_fd = io_write_fd;
+  session.ssl = io_ssl;
+  session.bwlimit = io_bwlimit;
+  session.bw_tokens = (unsigned long long)(bw_tokens < 0 ? 0 : bw_tokens);
+  session.bw_last_refill_sec = bw_last_refill.tv_sec;
+  session.bw_last_refill_nsec = bw_last_refill.tv_nsec;
+  return &session;
+}
+
+bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
+  ProtocolSession* session = legacy_session();
+  if (session->write_fd == -1)
+    session->write_fd = file_descriptor;
+  return protocol_send_n_data(session, data, data_size);
+}
+
+bool receive_n_data(int file_descriptor, void* data, size_t data_size) {
+  ProtocolSession* session = legacy_session();
+  if (session->read_fd == -1)
+    session->read_fd = file_descriptor;
+  return protocol_receive_n_data(session, data, data_size);
 }

 static int deadline_remaining_ms(const struct timespec* deadline) {
@@ -87,46 +165,67 @@ static int deadline_remaining_ms(const struct timespec* deadline) {
  return ms > INT_MAX ? INT_MAX : (int)ms;
 }

-bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
+bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t data_size) {
  log_message(LOG_LEVEL_DEBUG, "    Sending n Data: %zu", data_size);
-  int fd = io_fd(io_write_fd, file_descriptor);
+  if (!session)
+    return false;
+  int fd = session->write_fd;
+  struct timespec deadline;
+  clock_gettime(CLOCK_MONOTONIC, &deadline);
+  deadline.tv_sec += SEND_TIMEOUT_SEC;
+  short wait_events = POLLOUT;
  ssize_t total_bytes_send = 0;
  while ((size_t)total_bytes_send < data_size) {
    size_t chunk = data_size - total_bytes_send;
-    if (io_bwlimit > 0 && chunk > 65536)
+    if (session->bwlimit > 0 && chunk > 65536)
      chunk = 65536;
+    struct pollfd pfd = {.fd = fd, .events = wait_events};
+    int poll_result = poll(&pfd, 1, deadline_remaining_ms(&deadline));
+    if (poll_result == 0 || (poll_result < 0 && errno != EINTR)) {
+      log_message(LOG_LEVEL_ERROR, "Send timeout or poll failure");
+      return false;
+    }
+    if (poll_result < 0)
+      continue;
+    if (pfd.revents & (POLLERR | POLLNVAL))
+      return false;
    ssize_t bytes_send;
-    if (io_ssl)
-      bytes_send = SSL_write(io_ssl, (const char*)data + total_bytes_send, chunk);
+    if (session->ssl)
+      bytes_send = SSL_write(session->ssl, (const char*)data + total_bytes_send, chunk);
    else
      bytes_send = write(fd, (const char*)data + total_bytes_send, chunk);
    if (bytes_send <= 0) {
-      if (io_ssl) {
-        int ssl_err = SSL_get_error(io_ssl, (int)bytes_send);
-        if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ)
+      if (session->ssl) {
+        int ssl_err = SSL_get_error(session->ssl, (int)bytes_send);
+        if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ) {
+          wait_events = ssl_err == SSL_ERROR_WANT_WRITE ? POLLOUT : POLLIN;
          continue;
+        }
      }
      log_message(LOG_LEVEL_ERROR, "Could not send data");
      return false;
    }
-    bw_throttle((size_t)bytes_send);
+    bw_throttle_session(session, (size_t)bytes_send);
    total_bytes_send += bytes_send;
  }
  log_message(LOG_LEVEL_DEBUG, "    Send n Data: %zu", total_bytes_send);
  return true;
 }

-bool receive_n_data(int file_descriptor, void* data, size_t data_size) {
+bool protocol_receive_n_data(ProtocolSession* session, void* data, size_t data_size) {
  log_message(LOG_LEVEL_DEBUG, "    Receiving n Data: %zu", data_size);
-  int fd = io_fd(io_read_fd, file_descriptor);
+  if (!session)
+    return false;
+  int fd = session->read_fd;

  struct timespec deadline;
  clock_gettime(CLOCK_MONOTONIC, &deadline);
  deadline.tv_sec += RECEIVE_TIMEOUT_SEC;

  size_t total_bytes_received = 0;
+  short wait_events = POLLIN;
  while (total_bytes_received < data_size) {
-    struct pollfd pfd = {.fd = fd, .events = POLLIN};
+    struct pollfd pfd = {.fd = fd, .events = wait_events};
    int poll_result = poll(&pfd, 1, deadline_remaining_ms(&deadline));
    if (poll_result == 0) {
      log_message(LOG_LEVEL_ERROR, "Receive timeout after %ds", RECEIVE_TIMEOUT_SEC);
@@ -137,21 +236,24 @@ bool receive_n_data(int file_descriptor, void* data, size_t data_size) {
        continue;
      return false;
    }
+    /* POLLHUP may accompany the final readable bytes on pipes/sockets. */
    if (pfd.revents & (POLLERR | POLLNVAL))
      return false;

    ssize_t bytes_received;
-    if (io_ssl)
-      bytes_received =
-          SSL_read(io_ssl, (char*)data + total_bytes_received, data_size - total_bytes_received);
+    if (session->ssl)
+      bytes_received = SSL_read(session->ssl, (char*)data + total_bytes_received,
+                                data_size - total_bytes_received);
    else
      bytes_received =
          read(fd, (char*)data + total_bytes_received, data_size - total_bytes_received);
    if (bytes_received <= 0) {
-      if (io_ssl) {
-        int ssl_err = SSL_get_error(io_ssl, (int)bytes_received);
-        if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ)
+      if (session->ssl) {
+        int ssl_err = SSL_get_error(session->ssl, (int)bytes_received);
+        if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ) {
+          wait_events = ssl_err == SSL_ERROR_WANT_WRITE ? POLLOUT : POLLIN;
          continue;
+        }
      }
      if (bytes_received == 0)
        log_message(LOG_LEVEL_ERROR, "Connection closed while receiving data");
@@ -194,21 +296,24 @@ static const char* status_to_string(Status status) {
  }
 }

-bool send_str(int file_descriptor, const char* data) {
-  size_t size = strlen(data);
-  if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
+bool protocol_send_str(ProtocolSession* session, const char* data) {
+  if (data == NULL)
    return false;
-  if (!send_n_data(file_descriptor, data, size))
+  size_t size = strlen(data);
+  if (!protocol_send_n_data(session, &size, sizeof(size_t)))
+    return false;
+  if (!protocol_send_n_data(session, data, size))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Send String: %s", data);
  return true;
 }

-char* receive_str(int file_descriptor) {
+char* protocol_receive_str(ProtocolSession* session) {
  size_t size;
-  if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
+  if (!protocol_receive_n_data(session, &size, sizeof(size_t)))
    return NULL;
-  if (size > MAX_STRING_SIZE) {
+  if (size > MAX_STRING_SIZE || size > SIZE_MAX - 1 ||
+      size + 1 > MAX_CONNECTION_MEMORY - session->total_allocated_bytes) {
    log_message(LOG_LEVEL_ERROR, "String size %zu exceeds maximum %llu", size,
                (unsigned long long)MAX_STRING_SIZE);
    return NULL;
@@ -216,76 +321,116 @@ char* receive_str(int file_descriptor) {
  char* data = (char*)malloc(size + 1);
  if (data == NULL)
    return NULL;
-  if (!receive_n_data(file_descriptor, data, size)) {
+  if (!protocol_receive_n_data(session, data, size)) {
    free(data);
    return NULL;
  }
  data[size] = '\0';
+  session->total_allocated_bytes += size + 1;
  log_message(LOG_LEVEL_DEBUG, "Received String: %s", data);
  return data;
 }

-bool send_data(int file_descriptor, const Data* data) {
+bool protocol_send_data(ProtocolSession* session, const Data* data) {
  unsigned long long data_size = data->size;
-  if (!send_n_data(file_descriptor, &data_size, sizeof(unsigned long long)))
+  if (!protocol_send_n_data(session, &data_size, sizeof(unsigned long long)))
    return false;
-  if (!send_n_data(file_descriptor, data->data, data_size))
+  if (!protocol_send_n_data(session, data->data, data_size))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Send %lld data", data_size);
  return true;
 }

-Data* receive_data(int file_descriptor) {
+Data* protocol_receive_data(ProtocolSession* session) {
  unsigned long long size = 0;
-  if (!receive_n_data(file_descriptor, &size, sizeof(unsigned long long)))
+  if (!protocol_receive_n_data(session, &size, sizeof(unsigned long long)))
    return NULL;
-  if (size > MAX_DATA_SIZE) {
+  if (size > MAX_DATA_PAYLOAD_SIZE) {
    log_message(LOG_LEVEL_ERROR, "Data size %llu exceeds maximum %llu", size,
-                (unsigned long long)MAX_DATA_SIZE);
+                (unsigned long long)MAX_DATA_PAYLOAD_SIZE);
    return NULL;
  }
-  if (total_allocated_bytes + size > MAX_CONNECTION_MEMORY) {
+  size_t allocation_size = size == 0 ? 1 : (size_t)size;
+  if (allocation_size > MAX_CONNECTION_MEMORY - session->total_allocated_bytes) {
    log_message(LOG_LEVEL_ERROR, "Per-connection memory limit exceeded (%llu + %llu > %llu)",
-                (unsigned long long)total_allocated_bytes, size,
+                (unsigned long long)session->total_allocated_bytes, size,
                (unsigned long long)MAX_CONNECTION_MEMORY);
    return NULL;
  }
-  void* data = malloc((size_t)size);
+  void* data = malloc(allocation_size);
  if (data == NULL)
    return NULL;
-  if (!receive_n_data(file_descriptor, data, (size_t)size)) {
+  if (!protocol_receive_n_data(session, data, (size_t)size)) {
    free(data);
    return NULL;
  }
-  total_allocated_bytes += size;
+  session->total_allocated_bytes += allocation_size;
  log_message(LOG_LEVEL_DEBUG, "Received %lld data", size);
-  return data_create(data, (size_t)size);
+  Data* result = data_create(data, (size_t)size);
+  if (!result) {
+    free(data);
+    session->total_allocated_bytes -= allocation_size;
+  }
+  return result;
 }

-bool send_int(int file_descriptor, int data) {
-  if (!send_n_data(file_descriptor, &data, sizeof(int)))
+bool protocol_send_int(ProtocolSession* session, int data) {
+  if (!protocol_send_n_data(session, &data, sizeof(int)))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Send Int: %d", data);
  return true;
 }

-bool receive_int(int file_descriptor, int* data) {
-  if (!receive_n_data(file_descriptor, data, sizeof(int)))
+bool protocol_receive_int(ProtocolSession* session, int* data) {
+  if (!protocol_receive_n_data(session, data, sizeof(int)))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Received Int: %d", *data);
  return true;
 }

-bool send_status(int file_descriptor, Status status) {
-  if (!send_n_data(file_descriptor, &status, sizeof(Status)))
+bool protocol_send_status(ProtocolSession* session, Status status) {
+  if (!protocol_send_n_data(session, &status, sizeof(Status)))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Send Status: %s", status_to_string(status));
  return true;
 }

-bool receive_status(int file_descriptor, Status* status) {
-  if (!receive_n_data(file_descriptor, status, sizeof(Status)))
+bool protocol_receive_status(ProtocolSession* session, Status* status) {
+  if (!protocol_receive_n_data(session, status, sizeof(Status)))
    return false;
  log_message(LOG_LEVEL_DEBUG, "Received Status: %s", status_to_string(*status));
  return true;
 }
+
+bool send_str(int fd, const char* data) {
+  (void)fd;
+  return protocol_send_str(legacy_session(), data);
+}
+char* receive_str(int fd) {
+  (void)fd;
+  return protocol_receive_str(legacy_session());
+}
+bool send_data(int fd, const Data* data) {
+  (void)fd;
+  return protocol_send_data(legacy_session(), data);
+}
+Data* receive_data(int fd) {
+  (void)fd;
+  return protocol_receive_data(legacy_session());
+}
+bool send_int(int fd, int data) {
+  (void)fd;
+  return protocol_send_int(legacy_session(), data);
+}
+bool receive_int(int fd, int* data) {
+  (void)fd;
+  return protocol_receive_int(legacy_session(), data);
+}
+bool send_status(int fd, Status status) {
+  (void)fd;
+  return protocol_send_status(legacy_session(), status);
+}
+bool receive_status(int fd, Status* status) {
+  (void)fd;
+  return protocol_receive_status(legacy_session(), status);
+}
@@ -14,9 +14,28 @@
 /* Maximum chunk size (64 MB) — prevents unbounded allocation from the wire */
 #define MAX_CHUNK_SIZE (64ULL * 1024 * 1024)
 #define MAX_MANIFEST_ENTRIES (1024 * 1024)
+/* Aggregate bytes retained by one received deletion manifest. */
+#define MAX_MANIFEST_BYTES (16ULL * 1024 * 1024)

 typedef struct ssl_st SSL;

+/*
+ * Explicit owner of protocol I/O.  A session does not own the descriptors or
+ * SSL object; it only describes the transport used by a transfer.  This makes
+ * it safe to pass the transport to a worker without relying on inherited
+ * thread-local state.
+ */
+typedef struct ProtocolSession {
+  int read_fd;
+  int write_fd;
+  SSL* ssl;
+  unsigned long long bwlimit;
+  long long bw_tokens;
+  long long bw_last_refill_sec;
+  long bw_last_refill_nsec;
+  unsigned long long total_allocated_bytes;
+} ProtocolSession;
+
 typedef int Status;
 enum NET_STATUS {
  STATUS_OK,
@@ -37,6 +56,23 @@ void io_set_fds(int read_fd, int write_fd);
 void io_set_bwlimit(unsigned long long bytes_per_sec);
 void io_set_ssl(SSL* ssl);
 SSL* io_get_ssl(void);
+
+void protocol_session_init(ProtocolSession* session, int read_fd, int write_fd);
+/* Transitional bridge for helpers whose signatures still carry only an fd. */
+void protocol_session_bind(ProtocolSession* session);
+void protocol_session_unbind(void);
+void protocol_session_set_ssl(ProtocolSession* session, SSL* ssl);
+void protocol_session_set_bwlimit(ProtocolSession* session, unsigned long long bytes_per_sec);
+bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t data_size);
+bool protocol_receive_n_data(ProtocolSession* session, void* data, size_t data_size);
+bool protocol_send_str(ProtocolSession* session, const char* data);
+char* protocol_receive_str(ProtocolSession* session);
+bool protocol_send_data(ProtocolSession* session, const Data* data);
+Data* protocol_receive_data(ProtocolSession* session);
+bool protocol_send_int(ProtocolSession* session, int data);
+bool protocol_receive_int(ProtocolSession* session, int* data);
+bool protocol_send_status(ProtocolSession* session, Status status);
+bool protocol_receive_status(ProtocolSession* session, Status* status);
 bool send_n_data(int file_descriptor, const void* data, size_t data_size);
 bool receive_n_data(int file_descriptor, void* data, size_t data_size);

@@ -1,154 +1,154 @@
-#include <stdbool.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <threads.h>
-
-#include "queue.h"
-
-Queue* queue_create(int capacity, void (*destroyer)(void* item)) {
-  if (capacity <= 0)
-    return NULL;
-
-  Queue* queue = (Queue*)malloc(sizeof(Queue));
-  if (queue == NULL) {
-    perror("ERROR: Could not allocate memory for queue structure");
-    return NULL;
-  }
-
-  queue->items = malloc(capacity * sizeof(void*));
-  if (queue->items == NULL) {
-    free(queue);
-    return NULL;
-  }
-
-  for (int i = 0; i < capacity; ++i) {
-    queue->items[i] = NULL;
-  }
-
-  queue->capacity = capacity;
-  queue->front = 0;
-  queue->rear = 0;
-  queue->size = 0;
-  queue->item_destroyer = destroyer;
-
-  return queue;
-}
-
-void queue_destroy(Queue* queue) {
-  if (queue == NULL)
-    return;
-
-  if (queue->item_destroyer != NULL) {
-    for (int i = 0; i < queue->size; ++i) {
-      int index = (queue->front + i) % queue->capacity;
-      queue->item_destroyer(queue->items[index]);
-    }
-  }
-  free(queue->items);
-  free(queue);
-}
-
-bool queue_is_empty(const Queue* queue) {
-  if (queue == NULL)
-    return true;
-  return queue->size == 0;
-}
-
-bool queue_is_full(const Queue* queue) {
-  if (queue == NULL)
-    return false;
-  return queue->size == queue->capacity;
-}
-
-static bool queue_double_capacity(Queue* queue) {
-  if (queue == NULL)
-    return false;
-  if (queue->capacity > INT_MAX / 2)
-    return false;
-  int new_capacity = queue->capacity * 2;
-  if (new_capacity <= 1)
-    new_capacity = 100;
-  void** new_items = malloc(new_capacity * sizeof(void*));
-  if (new_items == NULL) {
-    perror("ERROR: Could not allocate memory for doubling capacity of queue.");
-    return false;
-  }
-  for (int i = 0; i < queue->size; i++)
-    new_items[i] = queue->items[(i + queue->front) % queue->capacity];
-  free(queue->items);
-  queue->items = new_items;
-  queue->front = 0;
-  queue->rear = queue->size;
-  queue->capacity = new_capacity;
-  return true;
-}
-
-bool queue_enqueue(Queue* queue, void* item) {
-  if (queue == NULL || item == NULL)
-    return false;
-  if (queue_is_full(queue)) {
-    if (!queue_double_capacity(queue))
-      return false;
-  }
-  queue->items[queue->rear] = item;
-  queue->rear = (queue->rear + 1) % queue->capacity;
-  queue->size++;
-  return true;
-}
-
-bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty,
-                                 cnd_t* condition_not_full) {
-  mtx_lock(mutex);
-  while (queue_is_full(queue))
-    cnd_wait(condition_not_full, mutex);
-  bool ok = queue_enqueue(queue, item);
-  cnd_signal(condition_not_empty);
-  mtx_unlock(mutex);
-  return ok;
-}
-
-bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
-                                        cnd_t* condition_not_empty, cnd_t* condition_not_full,
-                                        const bool* cancelled) {
-  mtx_lock(mutex);
-  while (queue_is_full(queue) && (cancelled == NULL || !*cancelled))
-    cnd_wait(condition_not_full, mutex);
-  if (cancelled != NULL && *cancelled) {
-    mtx_unlock(mutex);
-    return false;
-  }
-  bool ok = queue_enqueue(queue, item);
-  cnd_signal(condition_not_empty);
-  mtx_unlock(mutex);
-  return ok;
-}
-
-void* queue_dequeue(Queue* queue) {
-  if (queue == NULL || queue_is_empty(queue)) {
-    perror("ERROR: Could not dequeue from null or empty queue.");
-    return NULL;
-  }
-
-  void* item = queue->items[queue->front];
-  queue->items[queue->front] = NULL;
-  queue->front = (queue->front + 1) % queue->capacity;
-  queue->size--;
-  return item;
-}
-
-void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
-                                  cnd_t* condition_not_full, const bool* other_thread_done) {
-  mtx_lock(mutex);
-  while (queue_is_empty(queue) && !*other_thread_done)
-    cnd_wait(condition_not_empty, mutex);
-  if (queue_is_empty(queue) && *other_thread_done) {
-    mtx_unlock(mutex);
-    return NULL;
-  }
-  void* item = queue_dequeue(queue);
-  cnd_signal(condition_not_full);
-  mtx_unlock(mutex);
-  return item;
-}
+#include <stdbool.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <threads.h>
+
+#include "queue.h"
+
+Queue* queue_create(int capacity, void (*destroyer)(void* item)) {
+  if (capacity <= 0)
+    return NULL;
+
+  Queue* queue = (Queue*)malloc(sizeof(Queue));
+  if (queue == NULL) {
+    perror("ERROR: Could not allocate memory for queue structure");
+    return NULL;
+  }
+
+  queue->items = malloc(capacity * sizeof(void*));
+  if (queue->items == NULL) {
+    free(queue);
+    return NULL;
+  }
+
+  for (int i = 0; i < capacity; ++i) {
+    queue->items[i] = NULL;
+  }
+
+  queue->capacity = capacity;
+  queue->front = 0;
+  queue->rear = 0;
+  queue->size = 0;
+  queue->item_destroyer = destroyer;
+
+  return queue;
+}
+
+void queue_destroy(Queue* queue) {
+  if (queue == NULL)
+    return;
+
+  if (queue->item_destroyer != NULL) {
+    for (int i = 0; i < queue->size; ++i) {
+      int index = (queue->front + i) % queue->capacity;
+      queue->item_destroyer(queue->items[index]);
+    }
+  }
+  free(queue->items);
+  free(queue);
+}
+
+bool queue_is_empty(const Queue* queue) {
+  if (queue == NULL)
+    return true;
+  return queue->size == 0;
+}
+
+bool queue_is_full(const Queue* queue) {
+  if (queue == NULL)
+    return false;
+  return queue->size == queue->capacity;
+}
+
+static bool queue_double_capacity(Queue* queue) {
+  if (queue == NULL)
+    return false;
+  if (queue->capacity > INT_MAX / 2)
+    return false;
+  int new_capacity = queue->capacity * 2;
+  if (new_capacity <= 1)
+    new_capacity = 100;
+  void** new_items = malloc(new_capacity * sizeof(void*));
+  if (new_items == NULL) {
+    perror("ERROR: Could not allocate memory for doubling capacity of queue.");
+    return false;
+  }
+  for (int i = 0; i < queue->size; i++)
+    new_items[i] = queue->items[(i + queue->front) % queue->capacity];
+  free(queue->items);
+  queue->items = new_items;
+  queue->front = 0;
+  queue->rear = queue->size;
+  queue->capacity = new_capacity;
+  return true;
+}
+
+bool queue_enqueue(Queue* queue, void* item) {
+  if (queue == NULL || item == NULL)
+    return false;
+  if (queue_is_full(queue)) {
+    if (!queue_double_capacity(queue))
+      return false;
+  }
+  queue->items[queue->rear] = item;
+  queue->rear = (queue->rear + 1) % queue->capacity;
+  queue->size++;
+  return true;
+}
+
+bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty,
+                                 cnd_t* condition_not_full) {
+  mtx_lock(mutex);
+  while (queue_is_full(queue))
+    cnd_wait(condition_not_full, mutex);
+  bool ok = queue_enqueue(queue, item);
+  cnd_signal(condition_not_empty);
+  mtx_unlock(mutex);
+  return ok;
+}
+
+bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
+                                        cnd_t* condition_not_empty, cnd_t* condition_not_full,
+                                        const atomic_bool* cancelled) {
+  mtx_lock(mutex);
+  while (queue_is_full(queue) && (cancelled == NULL || !atomic_load(cancelled)))
+    cnd_wait(condition_not_full, mutex);
+  if (cancelled != NULL && atomic_load(cancelled)) {
+    mtx_unlock(mutex);
+    return false;
+  }
+  bool ok = queue_enqueue(queue, item);
+  cnd_signal(condition_not_empty);
+  mtx_unlock(mutex);
+  return ok;
+}
+
+void* queue_dequeue(Queue* queue) {
+  if (queue == NULL || queue_is_empty(queue)) {
+    perror("ERROR: Could not dequeue from null or empty queue.");
+    return NULL;
+  }
+
+  void* item = queue->items[queue->front];
+  queue->items[queue->front] = NULL;
+  queue->front = (queue->front + 1) % queue->capacity;
+  queue->size--;
+  return item;
+}
+
+void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
+                                  cnd_t* condition_not_full, const bool* other_thread_done) {
+  mtx_lock(mutex);
+  while (queue_is_empty(queue) && !*other_thread_done)
+    cnd_wait(condition_not_empty, mutex);
+  if (queue_is_empty(queue) && *other_thread_done) {
+    mtx_unlock(mutex);
+    return NULL;
+  }
+  void* item = queue_dequeue(queue);
+  cnd_signal(condition_not_full);
+  mtx_unlock(mutex);
+  return item;
+}
@@ -2,6 +2,7 @@
 #define QUEUE_H

 #include <stdbool.h>
+#include <stdatomic.h>
 #include <threads.h>

 typedef struct Queue {
@@ -22,7 +23,7 @@ bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t*
                                 cnd_t* condition_not_full);
 bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
                                        cnd_t* condition_not_empty, cnd_t* condition_not_full,
-                                        const bool* cancelled);
+                                        const atomic_bool* cancelled);
 void* queue_dequeue(Queue* queue);
 void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
                                  cnd_t* condition_not_full, const bool* other_thread_done);
@@ -173,7 +173,7 @@ Client* client_create() {
  return client;
 }

-bool client_connect(Client* client, char* host, int port) {
+bool tcp_connect_socket(Client* client, char* host, int port) {
  struct addrinfo hints;
  struct addrinfo* result;
  memset(&hints, 0, sizeof(hints));
@@ -222,6 +222,12 @@ bool client_connect(Client* client, char* host, int port) {
    return false;
  }

+  return true;
+}
+
+bool client_connect(Client* client, char* host, int port) {
+  if (!tcp_connect_socket(client, host, port))
+    return false;
  tcp_apply_socket_timeout(client->file_descriptor);
  return true;
 }
@@ -30,6 +30,7 @@ void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
 void server_delete(Server** server);
 Client* client_create();
 bool client_connect(Client* client, char* host, int port);
+bool tcp_connect_socket(Client* client, char* host, int port);
 void client_disconnect(Client* client);
 void client_delete(Client* client);
 void tcp_set_timeouts(int timeout_sec, int contimeout_sec);
@@ -3,15 +3,12 @@
 #include "protocol.h"
 #include "transport_tcp.h"
 #include <arpa/inet.h>
-#include <netdb.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
 #include <unistd.h>

 bool tls_global_init(void) {
@@ -149,53 +146,8 @@ bool server_listen_tls(Server* server, void (*handler)(int file_descriptor)) {

 bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
                        const char* key_path, const char* ca_path) {
-  struct addrinfo hints;
-  struct addrinfo* result;
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = IPPROTO_TCP;
-
-  char port_str[16];
-  snprintf(port_str, sizeof(port_str), "%d", port);
-
-  int err = getaddrinfo(host, port_str, &hints, &result);
-  if (err != 0 || result == NULL) {
-    fprintf(stderr, "Could not resolve host: %s (%s)\n", host, gai_strerror(err));
+  if (!tcp_connect_socket(client, host, port))
    return false;
-  }
-
-  struct addrinfo* rp;
-  bool connected = false;
-  for (rp = result; rp != NULL; rp = rp->ai_next) {
-    if (client->file_descriptor >= 0)
-      close(client->file_descriptor);
-
-    client->file_descriptor = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (client->file_descriptor < 0)
-      continue;
-
-    struct timeval ct;
-    ct.tv_sec = tcp_get_contimeout_sec();
-    ct.tv_usec = 0;
-    setsockopt(client->file_descriptor, SOL_SOCKET, SO_RCVTIMEO, &ct, sizeof(ct));
-    setsockopt(client->file_descriptor, SOL_SOCKET, SO_SNDTIMEO, &ct, sizeof(ct));
-
-    memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
-    client->address_length = rp->ai_addrlen;
-
-    if (connect(client->file_descriptor, (struct sockaddr*)&client->address,
-                client->address_length) == 0) {
-      connected = true;
-      break;
-    }
-  }
-  freeaddrinfo(result);
-
-  if (!connected) {
-    perror("Could not connect to Server!");
-    return false;
-  }

  SSL_CTX* ctx = create_ssl_ctx(false, cert_path, key_path, ca_path);
  if (!ctx)
@@ -3,18 +3,27 @@
 #include "libgen.h"
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>

+static int authorized_root_fd = -1;
+
+void utils_set_authorized_root_fd(int fd) {
+  authorized_root_fd = fd;
+}
+
 bool mkdir_r(const char* path) {
-  char* path_duplicate = malloc(strlen(path) + 1);
+  size_t path_len = strlen(path);
+  char* path_duplicate = malloc(path_len + 1);
  if (!path_duplicate)
    return false;
-  memcpy(path_duplicate, path, strlen(path) + 1);
-  char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
+  memcpy(path_duplicate, path, path_len + 1);
+  size_t capacity = path_len + 2;
+  char* path_current = (char*)malloc(capacity * sizeof(char));
  if (!path_current) {
    free(path_duplicate);
    return false;
@@ -33,6 +42,10 @@ bool mkdir_r(const char* path) {
  bool ok = true;
  while (part != NULL) {
    size_t part_len = strlen(part);
+    if ((size_t)(path_current_position - path_current) + part_len + 2 > capacity) {
+      ok = false;
+      break;
+    }
    memcpy(path_current_position, part, part_len);
    path_current_position += part_len;
    path_current_position[0] = '/';
@@ -64,10 +77,18 @@ char* str_dup(const char* string) {
  return new_string;
 }

+/* Match a glob pattern against a string. Supported wildcards:
+ *   ?      matches any single character except '/'.
+ *   *      matches any sequence of characters within one path component (no '/').
+ *   **     matches any sequence of characters, including '/' (cross-directory).
+ *   slash-star-star-slash is treated as a cross-directory wildcard when it appears between
+ * literals.
+ */
 bool glob_match(const char* pattern, const char* str) {
  while (*pattern) {
    if (*pattern == '*') {
      if (*(pattern + 1) == '*') {
+        /* globstar: match across directories */
        pattern += 2;
        if (*pattern == '\0')
          return true;
@@ -80,6 +101,7 @@ bool glob_match(const char* pattern, const char* str) {
        }
        return glob_match(pattern, str);
      }
+      /* single *: match within one path component */
      pattern++;
      while (*str && *str != '/') {
        if (glob_match(pattern, str))
@@ -94,6 +116,7 @@ bool glob_match(const char* pattern, const char* str) {
      str++;
    } else {
      if (*pattern != *str) {
+        /* allow literal / ** / rest to match any number of directories */
        if (*pattern == '/' && *(pattern + 1) == '*' && *(pattern + 2) == '*') {
          const char* rest = pattern + 3;
          if (*rest == '/')
@@ -120,34 +143,43 @@ static bool is_dir_in_manifest(const char* rel_path, ArrayList* manifest) {
  return false;
 }

-static void delete_extras_walk(const char* abs_path, const char* rel_path, ArrayList* manifest) {
-  DIR* dir = opendir(abs_path);
-  if (!dir)
-    return;
+static bool delete_extras_fd(int dirfd, const char* rel_path, ArrayList* manifest) {
+  int scanfd = dup(dirfd);
+  if (scanfd < 0)
+    return false;
+  DIR* dir = fdopendir(scanfd);
+  if (!dir) {
+    close(scanfd);
+    return false;
+  }
  bool all_removed = true;
+  bool operation_ok = true;
  const struct dirent* entry;
  while ((entry = readdir(dir)) != NULL) {
    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
      continue;
-    char* child_abs = path_cat((char*)abs_path, entry->d_name);
    char* child_rel = path_cat((char*)rel_path, entry->d_name);
    struct stat st;
-    if (lstat(child_abs, &st) != 0) {
-      free(child_abs);
+    if (fstatat(dirfd, entry->d_name, &st, AT_SYMLINK_NOFOLLOW) != 0) {
      free(child_rel);
      continue;
    }
    // Skip symlinks to prevent following them outside the destination tree
    if (S_ISLNK(st.st_mode)) {
-      free(child_abs);
      free(child_rel);
      continue;
    }
    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.
-      // Ignore ENOENT: the recursive call may have already removed it.
-      if (rmdir(child_abs) != 0 && errno != ENOENT) {
+      int childfd = openat(dirfd, entry->d_name, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
+      bool child_removed = false;
+      if (childfd >= 0) {
+        child_removed = delete_extras_fd(childfd, child_rel, manifest);
+        close(childfd);
+      }
+      if (child_removed && !is_dir_in_manifest(child_rel, manifest) &&
+          unlinkat(dirfd, entry->d_name, AT_REMOVEDIR) != 0 && errno != ENOENT) {
+        operation_ok = false;
+      } else if (!child_removed) {
        all_removed = false;
      }
    } else {
@@ -160,25 +192,30 @@ static void delete_extras_walk(const char* abs_path, const char* rel_path, Array
        }
      }
      if (!found) {
-        unlink(child_abs);
+        if (unlinkat(dirfd, entry->d_name, 0) != 0 && errno != ENOENT)
+          operation_ok = false;
        fprintf(stderr, "  Deleted: %s\n", child_rel);
      } else {
        all_removed = false;
      }
    }
-    free(child_abs);
    free(child_rel);
  }
  closedir(dir);
-  // Only remove the directory itself if it is not in the manifest
-  // and contained no kept entries.
-  if (all_removed && rel_path[0] != '\0' && !is_dir_in_manifest(rel_path, manifest)) {
-    rmdir(abs_path);
-  }
+  (void)all_removed;
+  return operation_ok;
 }

-void delete_extras(const char* dest_root, ArrayList* manifest) {
-  delete_extras_walk(dest_root, "", manifest);
+bool delete_extras(const char* dest_root, ArrayList* manifest) {
+  int rootfd = authorized_root_fd >= 0
+                   ? dup(authorized_root_fd)
+                   : open(dest_root, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
+  if (rootfd < 0)
+    return false;
+  bool ok = delete_extras_fd(rootfd, "", manifest);
+  if (close(rootfd) != 0)
+    ok = false;
+  return ok;
 }

 bool has_path_traversal(const char* path) {
@@ -200,6 +237,10 @@ bool has_path_traversal(const char* path) {
  return false;
 }

+bool utils_valid_batch_path(const char* path) {
+  return path && path[0] != '\0' && path[0] != '/' && !has_path_traversal(path);
+}
+
 char* path_cat(const char* path1, const char* path2) {
  if (path1 == NULL || *path1 == '\0')
    return str_dup(path2);
@@ -8,7 +8,9 @@ bool mkdir_r(const char* path);
 char* str_dup(const char* string);
 char* path_cat(const char* path1, const char* path2);
 bool glob_match(const char* pattern, const char* str);
-void delete_extras(const char* dest_root, ArrayList* manifest);
+bool delete_extras(const char* dest_root, ArrayList* manifest);
+void utils_set_authorized_root_fd(int fd);
 bool has_path_traversal(const char* path);
+bool utils_valid_batch_path(const char* path);

 #endif
@@ -240,8 +240,10 @@ class TestDelete:
        )

        assert result.returncode == 0, f"Delete sync failed: {(result.stderr or result.stdout)[:200]}"
-        assert not os.path.exists(extra_file), "extra_file.txt should be deleted"
-        assert not os.path.exists(extra_dir), "extra_dir should be deleted"
+        # The default server policy intentionally refuses client-requested
+        # deletion unless it is started with --allow-delete.
+        assert os.path.exists(extra_file), "unauthorized delete removed an extra file"
+        assert os.path.exists(extra_dir), "unauthorized delete removed an extra directory"

        mismatches, missing = verify_transfer(SOURCE_DIR, received)
        assert not missing, f"Missing: {missing}"
@@ -258,7 +260,8 @@ class TestProgress:
        )
        assert result.returncode == 0, f"Exit {result.returncode}: {result.stderr[:100]}"
        output = result.stdout + result.stderr
-        assert len(output) >= 0
+        assert "Sent " in output and "MB" in output, "--progress produced no stable byte marker"
+        assert "Done." in output, "--progress did not report completion"


 class TestBandwidthLimit:
@@ -4,57 +4,58 @@ import shutil
 import subprocess
 import sys
 import pytest
+import shlex
+import tempfile
+import shutil

 sys.path.insert(0, os.path.dirname(__file__))
-from common import (
-    PROJECT_ROOT, BUILD_DIR, TEST_DATA_DIR,
-    CLIENT_CMD, generate_test_files, verify_transfer, clean_dir, make_result,
-)
+from common import (PROJECT_ROOT, BUILD_DIR, TEST_DATA_DIR, CLIENT_CMD,
+                    generate_test_files, verify_transfer, clean_dir, make_result,
+                    get_dest_received_dir)

 SOURCE_DIR = os.path.join(TEST_DATA_DIR, "ssh_source")
 DEST_DIR = os.path.join(TEST_DATA_DIR, "ssh_dest")
 SSH_AVAILABLE = False
+SSH_SKIP_REASON = "SSH localhost probe was not run"
+SSH_PROBE_DIR = None


 def _check_ssh():
-    global SSH_AVAILABLE
+    global SSH_AVAILABLE, SSH_SKIP_REASON, SSH_PROBE_DIR
+    server_path = os.path.join(BUILD_DIR, "server")
+    if not os.path.isfile(server_path):
+        SSH_SKIP_REASON = f"current server binary is missing: {server_path}"
+        return
    try:
-        r = subprocess.run(
-            ["ssh", "-o", "BatchMode=yes", "-o", "ConnectTimeout=5",
-             "localhost", "which", "fastsync-server"],
-            capture_output=True, timeout=10,
-        )
-        if r.returncode == 0:
+        SSH_PROBE_DIR = tempfile.mkdtemp(prefix="fastsync-ssh-probe-")
+        probe_server = os.path.join(SSH_PROBE_DIR, "fastsync-server")
+        os.symlink(server_path, probe_server)
+        command = f"{shlex.quote(probe_server)} --help"
+        path = subprocess.run(["ssh", "-o", "BatchMode=yes", "-o", "ConnectTimeout=5",
+                               "localhost", "sh", "-c", command],
+                              capture_output=True, timeout=10, text=True)
+        if path.returncode != 0:
+            SSH_SKIP_REASON = "SSH to localhost is unavailable or current server probe failed"
+            return
+        if "FastSync Server" in path.stdout:
            SSH_AVAILABLE = True
            return
-
-        # Try to install server binary into PATH
-        server_path = os.path.join(BUILD_DIR, "server")
-        r = subprocess.run(
-            ["ssh", "-o", "BatchMode=yes", "localhost", 'echo "$PATH"'],
-            capture_output=True, timeout=10, text=True,
-        )
-        if r.returncode != 0:
-            return
-        for d in r.stdout.strip().split(":"):
-            d = d.strip()
-            if not d or "wrappers" in d:
-                continue
-            test = subprocess.run(
-                ["ssh", "-o", "BatchMode=yes", "localhost",
-                 f'test -w "{d}" && ln -sf {server_path} "{d}/fastsync-server" && which fastsync-server'],
-                capture_output=True, timeout=10,
-            )
-            if test.returncode == 0:
-                SSH_AVAILABLE = True
-                return
+        SSH_SKIP_REASON = "SSH probe did not execute the current server binary"
    except FileNotFoundError:
-        pass
+        SSH_SKIP_REASON = "ssh executable is unavailable"
+    except (OSError, subprocess.TimeoutExpired) as exc:
+        SSH_SKIP_REASON = f"SSH setup failed: {exc}"
+    finally:
+        if SSH_PROBE_DIR:
+            shutil.rmtree(SSH_PROBE_DIR, ignore_errors=True)
+            SSH_PROBE_DIR = None
+
+
+_check_ssh()


@pytest.fixture(scope="module", autouse=True)
 def setup_test_data():
-    _check_ssh()
    if SSH_AVAILABLE:
        generate_test_files(SOURCE_DIR, full=False)
        clean_dir(DEST_DIR)
@@ -63,18 +64,17 @@ def setup_test_data():


 def _run_ssh_test(name, flags, expected_missing=None):
-    """Run an SSH test case (no server process needed, client spawns SSH)."""
    ssh_dest = f"localhost:{DEST_DIR}"
    clean_dir(DEST_DIR)
-    cmd = CLIENT_CMD + [SOURCE_DIR, ssh_dest, "--save-to-disk"] + flags
+    cmd = CLIENT_CMD + [SOURCE_DIR, ssh_dest, "--save-to-disk",
+                        "--fastsync-server-path", os.path.join(BUILD_DIR, "server")] + flags
    start = __import__("time").monotonic()
    result = subprocess.run(cmd, text=True, capture_output=True)
    duration = __import__("time").monotonic() - start
-
    if result.returncode != 0:
-        return make_result(name, False, duration, f"Exit {result.returncode}: {(result.stderr or result.stdout)[:100]}")
-
-    mismatches, missing = verify_transfer(SOURCE_DIR, DEST_DIR)
+        return make_result(name, False, duration,
+                           f"Exit {result.returncode}: {(result.stderr or result.stdout)[:100]}")
+    mismatches, missing = verify_transfer(SOURCE_DIR, get_dest_received_dir(DEST_DIR, SOURCE_DIR))
    if expected_missing:
        missing = [m for m in missing if m not in expected_missing]
    if missing:
@@ -84,8 +84,12 @@ def _run_ssh_test(name, flags, expected_missing=None):
    return make_result(name, True, duration)


-@pytest.mark.skipif(not SSH_AVAILABLE, reason="SSH to localhost not available")
 class TestSSHStandard:
+    @pytest.fixture(autouse=True)
+    def require_ssh(self):
+        if not SSH_AVAILABLE:
+            pytest.skip(SSH_SKIP_REASON)
+
    def test_standard(self):
        r = _run_ssh_test("SSH (localhost)", [])
        assert r["status"] == "Success", r["error"]
@@ -119,14 +123,17 @@ class TestSSHStandard:
        assert r["status"] == "Success", r["error"]


-@pytest.mark.skipif(not SSH_AVAILABLE, reason="SSH to localhost not available")
 class TestSSHFeatures:
+    @pytest.fixture(autouse=True)
+    def require_ssh(self):
+        if not SSH_AVAILABLE:
+            pytest.skip(SSH_SKIP_REASON)
+
    def test_archive(self):
        r = _run_ssh_test("SSH Archive (-a)", ["-a"])
        assert r["status"] == "Success", r["error"]

    def test_exclude(self):
        r = _run_ssh_test("SSH Exclude (--exclude small.txt)",
-                          ["--exclude", "small.txt"],
-                          expected_missing=["small.txt"])
+                          ["--exclude", "small.txt"], expected_missing=["small.txt"])
        assert r["status"] == "Success", r["error"]
@@ -25,6 +25,7 @@
 #include "test_transport_tls.h"
 #include "test_utils.h"
 #include <stdio.h>
+#include <signal.h>

 // Define global test state variables
 int tests_run = 0;
@@ -32,6 +33,7 @@ int tests_failed = 0;
 bool current_test_failed = false;

 int main() {
+  signal(SIGPIPE, SIG_IGN);
  printf("\033[1;36m=== RUNNING UNIT TESTS ===\033[0m\n\n");

  RUN_TEST(test_queue);
@@ -1,4 +1,5 @@
 #include "test_client_cli.h"
+#include "client_validation.h"
 #include "config.h"
 #include "test_utils.h"
 #include "utils.h"
@@ -6,6 +7,59 @@
 #include <string.h>
 #include <unistd.h>

+/* Declaration of parse_args from client_cli.c */
+int parse_args(Config* config, int argc, char* argv[], int* positional_args, int* positional_count);
+
+static Config* valid_client_config() {
+  Config* cfg = config_create();
+  if (!cfg)
+    return NULL;
+  cfg->send_directory = str_dup("/src");
+  cfg->receive_root_directory = str_dup("/dst");
+  return cfg;
+}
+
+static void test_validate_config_required_paths() {
+  Config* cfg = config_create();
+  EXPECT_FALSE(validate_config(cfg));
+  cfg->send_directory = str_dup("/src");
+  EXPECT_FALSE(validate_config(cfg));
+  config_delete(cfg);
+}
+
+static void test_validate_config_incompatible_options() {
+  Config* cfg = valid_client_config();
+  cfg->use_sendfile = true;
+  cfg->use_compression = true;
+  EXPECT_FALSE(validate_config(cfg));
+  cfg->use_compression = false;
+  cfg->use_incremental = true;
+  cfg->use_chunk_serialization = true;
+  EXPECT_FALSE(validate_config(cfg));
+  config_delete(cfg);
+}
+
+static void test_validate_config_tls_requirements() {
+  Config* cfg = valid_client_config();
+  cfg->use_tls = true;
+  EXPECT_FALSE(validate_config(cfg));
+  cfg->tls_cert = str_dup("cert.pem");
+  EXPECT_FALSE(validate_config(cfg));
+  cfg->tls_key = str_dup("key.pem");
+  EXPECT_TRUE(validate_config(cfg));
+  config_delete(cfg);
+}
+
+static void test_validate_config_delta_sendfile_constraints() {
+  Config* cfg = valid_client_config();
+  cfg->use_delta = true;
+  EXPECT_FALSE(validate_config(cfg));
+  cfg->use_incremental = true;
+  cfg->use_sendfile = true;
+  EXPECT_FALSE(validate_config(cfg));
+  config_delete(cfg);
+}
+
 /* Test main() with --help flag (early return path, no server connection needed) */
 static void test_cli_help() {
  /* We can't easily call main() because it calls send_files which needs a server.
@@ -80,10 +134,228 @@ static void test_cli_exclude_patterns() {
  config_delete(cfg);
 }

+/* Test parse_args with --help returns 1 (clean exit) */
+static void test_parse_args_help() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "--help"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 2, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args with -V/--version returns 1 */
+static void test_parse_args_version() {
+  Config* cfg = config_create();
+  char* argv_short[] = {"fastsync", "-V"};
+  char* argv_long[] = {"fastsync", "--version"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 2, argv_short, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 1);
+
+  ret = parse_args(cfg, 2, argv_long, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args with valid port */
+static void test_parse_args_valid_port() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "-p", "2222", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 0);
+  EXPECT_EQ_INT(cfg->ssh_port, 2222);
+  EXPECT_EQ_INT(positional_count, 2);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args rejects port > 65535 */
+static void test_parse_args_invalid_port() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "-p", "99999", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, -1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args rejects non-numeric port */
+static void test_parse_args_non_numeric_port() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "-p", "abc", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, -1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args rejects server port > 65535 */
+static void test_parse_args_invalid_server_port() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "--server-port", "70000", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, -1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args rejects invalid compression level */
+static void test_parse_args_invalid_compression_level() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "-c", "25", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, -1);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args accepts valid compression level */
+static void test_parse_args_valid_compression_level() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "-c", "10", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 5, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 0);
+  EXPECT_EQ_INT(cfg->compression_level, 10);
+
+  config_delete(cfg);
+}
+
+/* Test parse_args unknown option returns error */
+static void test_parse_args_unknown_option() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "--nonexistent", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 4, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, -1);
+
+  config_delete(cfg);
+}
+
+/* Parsed-but-unimplemented options must fail instead of being silently accepted. */
+static void test_parse_args_rejects_unimplemented_options() {
+  static const char* const options[] = {"-q",
+                                        "--quiet",
+                                        "--silent",
+                                        "--queue-size",
+                                        "-H",
+                                        "--hard-links",
+                                        "-A",
+                                        "--acls",
+                                        "-X",
+                                        "--xattrs",
+                                        "-D",
+                                        "--devices",
+                                        "-i",
+                                        "--itemize-changes",
+                                        "--out-format",
+                                        "--info",
+                                        "--debug",
+                                        "--list-only",
+                                        "-h",
+                                        "--human-readable",
+                                        "-u",
+                                        "--update",
+                                        "--append",
+                                        "--append-verify",
+                                        "--delete-excluded",
+                                        "--delete-after",
+                                        "--max-delete",
+                                        "--filter",
+                                        "--files-from",
+                                        "--cvs-exclude",
+                                        "--prune-empty-dirs",
+                                        "-R",
+                                        "--relative",
+                                        "-e",
+                                        "--rsh",
+                                        "--rsync-path",
+                                        "--temp-dir",
+                                        "--compare-dest",
+                                        "--copy-dest",
+                                        "--link-dest",
+                                        "--delete-before",
+                                        "--address",
+                                        "--bind-address",
+                                        "--ipv6",
+                                        "--ipv4",
+                                        "--daemon",
+                                        "--config",
+                                        "--server",
+                                        "--compress-choice"};
+
+  for (size_t i = 0; i < sizeof(options) / sizeof(options[0]); i++) {
+    Config* cfg = config_create();
+    char* argv[] = {"fastsync", (char*)options[i], "dummy", "/src", "/dst"};
+    int positional_args[2];
+    int positional_count = 0;
+
+    EXPECT_EQ_INT(parse_args(cfg, 5, argv, positional_args, &positional_count), -1);
+    config_delete(cfg);
+  }
+}
+
+/* Test parse_args with --archive flag */
+static void test_parse_args_archive() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "--archive", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  int ret = parse_args(cfg, 4, argv, positional_args, &positional_count);
+  EXPECT_EQ_INT(ret, 0);
+  EXPECT_TRUE(cfg->use_compression);
+  EXPECT_TRUE(cfg->use_multithreading);
+  EXPECT_TRUE(cfg->use_metadata);
+
+  config_delete(cfg);
+}
+
 void test_client_cli() {
+  test_validate_config_required_paths();
+  test_validate_config_incompatible_options();
+  test_validate_config_tls_requirements();
+  test_validate_config_delta_sendfile_constraints();
  test_cli_help();
  test_cli_archive_flags();
  test_cli_dry_run();
  test_cli_delete_flag();
  test_cli_exclude_patterns();
+  test_parse_args_help();
+  test_parse_args_version();
+  test_parse_args_valid_port();
+  test_parse_args_invalid_port();
+  test_parse_args_non_numeric_port();
+  test_parse_args_invalid_server_port();
+  test_parse_args_invalid_compression_level();
+  test_parse_args_valid_compression_level();
+  test_parse_args_unknown_option();
+  test_parse_args_rejects_unimplemented_options();
+  test_parse_args_archive();
 }
@@ -224,6 +224,26 @@ static void test_config_send_receive_version_mismatch() {
  }
 }

+static void test_config_receive_truncated() {
+  int p[2];
+  EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
+  io_set_fds(p[0], p[0]);
+  io_set_bwlimit(0);
+
+  /* A valid prefix exercises cleanup after allocated wire strings and a
+   * partially received scalar field. */
+  EXPECT_TRUE(send_str(p[1], PROTOCOL_VERSION));
+  EXPECT_TRUE(send_str(p[1], "/src"));
+  EXPECT_TRUE(send_str(p[1], "/dst"));
+  EXPECT_TRUE(send_int(p[1], 1));
+  shutdown(p[1], SHUT_WR);
+
+  const Config* cfg = config_receive(p[0]);
+  EXPECT_NULL(cfg);
+  close(p[0]);
+  close(p[1]);
+}
+
 static void test_is_remote_dest() {
  /* Valid SSH-style destinations */
  EXPECT_TRUE(is_remote_dest("user@host:/path"));
@@ -256,6 +276,7 @@ void test_config() {
  if (!is_running_under_valgrind()) {
    test_config_send_receive();
    test_config_send_receive_version_mismatch();
+    test_config_receive_truncated();
  }
  test_is_remote_dest();
 }
@@ -327,6 +327,22 @@ static void test_large_file_delta() {
  free(new_data);
 }

+static void test_delta_apply_rejects_output_overflow() {
+  uint8_t old_data[8] = {0};
+  uint8_t literal_data[2] = {'x', 'y'};
+  DeltaInstruction instruction = {
+      .type = DELTA_INSTR_LITERAL,
+      .literal = {.data = literal_data, .length = sizeof(literal_data)},
+  };
+  Delta delta = {
+      .new_file_size = 1,
+      .instruction_count = 1,
+      .instructions = &instruction,
+  };
+
+  EXPECT_TRUE(delta_apply(old_data, sizeof(old_data), &delta, 1) == NULL);
+}
+
 void test_delta() {
  test_adler32_basic();
  test_adler32_different_data();
@@ -343,4 +359,5 @@ void test_delta() {
  test_should_attempt();
  test_is_worthwhile();
  test_large_file_delta();
+  test_delta_apply_rejects_output_overflow();
 }
@@ -38,6 +38,23 @@ static void test_send_receive_n_data_zero() {
  close(p[1]);
 }

+static void test_explicit_session_context() {
+  int p[2];
+  EXPECT_EQ_INT(pipe(p), 0);
+  ProtocolSession session;
+  protocol_session_init(&session, p[0], p[1]);
+  protocol_session_set_bwlimit(&session, 0);
+
+  const char payload[] = "explicit context";
+  char received[sizeof(payload)] = {0};
+  EXPECT_TRUE(protocol_send_n_data(&session, payload, sizeof(payload)));
+  EXPECT_TRUE(protocol_receive_n_data(&session, received, sizeof(received)));
+  EXPECT_EQ_INT(memcmp(payload, received, sizeof(payload)), 0);
+
+  close(p[0]);
+  close(p[1]);
+}
+
 static void test_send_receive_str() {
  int p[2];
  EXPECT_EQ_INT(pipe(p), 0);
@@ -173,6 +190,7 @@ static void test_receive_str_truncated() {
 void test_protocol() {
  test_send_receive_n_data();
  test_send_receive_n_data_zero();
+  test_explicit_session_context();
  test_send_receive_str();
  test_send_receive_str_normal();
  test_send_receive_data();
@@ -11,11 +11,7 @@
 #include <sys/wait.h>
 #include <unistd.h>

-/* Include server.c but rename main to avoid conflict with test runner's main */
-#define main server_main_
-#define FASTSYNC_SERVER_AS_LIB
-#include "server.c"
-#undef main
+#include "receiver.h"

 /* Test receive_files with immediate FINISHED status */
 static void test_receive_files_finished() {
@@ -36,7 +32,7 @@ static void test_receive_files_finished() {
    /* Child: use p[0] for both read and write */
    close(p[1]);
    io_set_fds(p[0], p[0]);
-    int ret = receive_files(cfg, p[0]);
+    int ret = receiver_receive_files(cfg, p[0]);
    close(p[0]);
    config_delete(cfg);
    _exit(ret == 0 ? 0 : 1);
@@ -88,7 +84,7 @@ static void test_receive_files_single_file() {
    /* Child: use p[0] for both read and write */
    close(p[1]);
    io_set_fds(p[0], p[0]);
-    int ret = receive_files(cfg, p[0]);
+    int ret = receiver_receive_files(cfg, p[0]);
    close(p[0]);
    config_delete(cfg);
    _exit(ret == 0 ? 0 : 1);
@@ -149,7 +145,7 @@ static void test_receive_files_abort() {
  if (pid == 0) {
    close(p[1]);
    io_set_fds(p[0], p[0]);
-    int ret = receive_files(cfg, p[0]);
+    int ret = receiver_receive_files(cfg, p[0]);
    close(p[0]);
    config_delete(cfg);
    /* Should return -1 on abort */
Author	SHA1	Message	Date
TapTap	c220dc0739	docs: clarify rsync compatibility roadmap CI / lint (pull_request) Successful in 30s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 37s Details CI / fuzz-build (pull_request) Successful in 17s Details CI / coverage (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 34s Details	2026-08-15 12:49:07 +02:00
TapTap	298976aefb	fix: link receiver into fuzz targets CI / lint (pull_request) Successful in 29s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 16s Details CI / coverage (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m16s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-15 12:34:19 +02:00
TapTap	3b7f97853c	fix: satisfy cppcheck const analysis CI / lint (pull_request) Successful in 31s Details CI / sanitizers (address) (pull_request) Successful in 38s Details CI / sanitizers (undefined) (pull_request) Successful in 37s Details CI / fuzz-build (pull_request) Failing after 14s Details CI / coverage (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-15 12:30:52 +02:00
TapTap	8cca891b9a	refactor: split transfer and protocol responsibilities CI / lint (pull_request) Failing after 30s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-15 12:27:18 +02:00
TapTap	786e686563	fix: satisfy clang-format in CLI test CI / lint (pull_request) Successful in 33s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 37s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m16s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-15 11:52:05 +02:00
TapTap	046c8d1035	Merge pull request 'Evaluation of codebase by human' (#210 ) from evaluation-of-codebase-by-human into dev CI / lint (push) Failing after 3s Details CI / build-and-test (push) Has been skipped Details CI / sanitizers (address) (push) Has been skipped Details CI / sanitizers (undefined) (push) Has been skipped Details CI / fuzz-build (push) Has been skipped Details CI / coverage (push) Has been skipped Details CI / valgrind (push) Has been skipped Details	2026-08-11 21:24:37 +02:00
TapTap	634cddee3b	Merge dev into human codebase evaluation CI / lint (pull_request) Failing after 2s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-11 21:24:17 +02:00
TapTap	75040103d3	Merge pull request 'Remove unimplemented CLI options' (#209 ) from feat/remove-unimplemented-cli-options into evaluation-of-codebase-by-human CI / lint (pull_request) Successful in 25s Details CI / sanitizers (address) (pull_request) Successful in 35s Details CI / sanitizers (undefined) (pull_request) Successful in 35s Details CI / fuzz-build (pull_request) Successful in 13s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details Reviewed-on: #209	2026-08-11 21:17:52 +02:00
TapTap	852e47a143	Satisfy cppcheck CLI and logger checks CI / lint (pull_request) Successful in 25s Details CI / sanitizers (address) (pull_request) Successful in 35s Details CI / sanitizers (undefined) (pull_request) Successful in 35s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m14s Details CI / valgrind (pull_request) Successful in 32s Details	2026-08-11 21:14:56 +02:00
TapTap	679e389ba6	Fix va_list cleanup in logger CI / lint (pull_request) Failing after 25s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-11 21:12:00 +02:00
TapTap	2e00fc31f2	Format CLI option test table CI / lint (pull_request) Failing after 25s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-11 21:08:54 +02:00
TapTap	9396de88db	Merge pull request 'fix: complete issues #201-#206 remediation' (#208 ) from feat/triage-complete into dev CI / lint (push) Successful in 33s Details CI / sanitizers (address) (push) Successful in 37s Details CI / sanitizers (undefined) (push) Successful in 36s Details CI / fuzz-build (push) Successful in 13s Details CI / coverage (push) Successful in 31s Details CI / build-and-test (push) Successful in 1m15s Details CI / valgrind (push) Successful in 32s Details Reviewed-on: #208	2026-08-11 21:06:49 +02:00
TapTap	d146e1bb7c	Remove unimplemented CLI options CI / lint (pull_request) Failing after 3s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-11 20:59:06 +02:00
TapTap	09fca8d931	start of human refactoring	2026-08-11 20:26:15 +02:00
TapTap	b88e17826e	fix: satisfy metadata const lint CI / lint (pull_request) Successful in 33s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 37s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m16s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-10 19:20:38 +02:00
TapTap	690bf72d7f	fix: close remaining PR 208 review findings CI / lint (pull_request) Failing after 33s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-10 19:10:02 +02:00
TapTap	d367706689	fix: satisfy file API const analysis CI / lint (pull_request) Successful in 31s Details CI / sanitizers (address) (pull_request) Successful in 38s Details CI / sanitizers (undefined) (pull_request) Successful in 38s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m16s Details CI / valgrind (pull_request) Successful in 32s Details	2026-08-10 17:30:13 +02:00
TapTap	5f0aed72e7	fix: satisfy metadata const analysis CI / lint (pull_request) Failing after 31s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-10 17:28:49 +02:00
TapTap	44c2a8bb79	fix: satisfy static analysis in review paths CI / lint (pull_request) Failing after 31s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-10 17:27:33 +02:00
TapTap	7776a63d3d	fix: close remaining PR 208 review gaps CI / lint (pull_request) Failing after 32s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-10 17:26:00 +02:00
TapTap	5bc319f694	fix: remove redundant poll timeout branch CI / lint (pull_request) Successful in 26s Details CI / sanitizers (address) (pull_request) Successful in 36s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-09 11:53:54 +02:00
TapTap	1a0a7a19a5	style: format atomic queue cancellation CI / lint (pull_request) Failing after 27s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-09 11:52:51 +02:00
TapTap	d64666d456	fix: close remaining PR 208 security gaps CI / lint (pull_request) Failing after 3s Details CI / build-and-test (pull_request) Has been skipped Details CI / sanitizers (address) (pull_request) Has been skipped Details CI / sanitizers (undefined) (pull_request) Has been skipped Details CI / fuzz-build (pull_request) Has been skipped Details CI / coverage (pull_request) Has been skipped Details CI / valgrind (pull_request) Has been skipped Details	2026-08-09 11:52:15 +02:00
TapTap	cc143316b2	Merge latest dev into triage remediation CI / lint (pull_request) Successful in 25s Details CI / sanitizers (address) (pull_request) Successful in 35s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-09 11:30:08 +02:00
TapTap	cb671bade0	Merge pull request 'fix: validate delta output and integration test skips' (#207 ) from fix/triage-delta-validation into dev Reviewed-on: #207	2026-08-08 20:17:38 +02:00
TapTap	4feb75957a	fix: validate delta output and integration test skips CI / lint (pull_request) Successful in 24s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 13s Details CI / coverage (pull_request) Successful in 30s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-08 20:09:06 +02:00
TapTap	d529360c01	Merge pull request 'refactor: extract CLI parser helpers, fix validation bugs' (#200 ) from refactor/cli-parser-helpers into dev Reviewed-on: #200	2026-08-08 20:02:09 +02:00
TapTap	8743d7f522	fix: address PR #200 review issues CI / lint (pull_request) Successful in 35s Details CI / sanitizers (undefined) (pull_request) Successful in 39s Details CI / fuzz-build (pull_request) Successful in 12s Details CI / sanitizers (address) (pull_request) Successful in 55s Details CI / coverage (pull_request) Successful in 30s Details CI / valgrind (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m34s Details - Fix memory leak in delta_deserialize() on BLOCK_MATCH error path - Fix memory leak on malloc failure for literal data - Add port range validation (1-65535) for -p/--port and --server-port - Restore -V/--version flag with usage text - Use MAX_DATA_PAYLOAD_SIZE consistently (remove local MAX_DATA_SIZE) - Fix integer truncation in config_send/config_receive for delta_block_size - Add log messages for malloc failures - Extract config_set_defaults() helper to eliminate duplication - Add 10 new CLI tests for argument parsing	2026-08-08 20:01:48 +02:00
TapTap	05a74770ca	fix: address PR #200 review issues CI / lint (pull_request) Successful in 22s Details CI / sanitizers (address) (pull_request) Successful in 37s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 13s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details - Restore PROTOCOL_VERSION to a forward-compatible 2.1.0 and document wire format - Add NULL guard to config_delete - Add pipeline cancellation flag and cancellation-aware queue helper - Join running threads before destroying pipeline contexts on creation failure - Fix NULL dereference and memory leaks in manifest/chunk handling - Fix TLS/TCP socket fd leak on connect error paths - Add compression-level range validation (1-22) - Close previous log file before opening a new one - Use getline for unbounded pattern-file lines - Fix thread-unsafe localtime() and add log level bounds check - Fix file_load_data to clean up data on read size mismatch - Add hard ceiling to decompression buffer growth - Fix mkdir_r bounds check and restore glob comments - Add send_str NULL guard and mutex-protect bandwidth limiter - Update AGENTS.md for per-thread io_ssl contract	2026-08-02 09:34:54 +02:00
TapTap	1064ae6c19	fix: address PR review issues in client_cli.c CI / lint (pull_request) Successful in 23s Details CI / sanitizers (address) (pull_request) Successful in 36s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 13s Details CI / coverage (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details - Fix FILE* leak when --log-file specified multiple times - Add strtoull endptr validation for --delta-block/--delta-max - Add range validation (1-22) for -c compression level	2026-08-01 18:42:02 +02:00
TapTap	bf91c5b588	merge: resolve conflict with dev, apply helpers to new options CI / lint (pull_request) Successful in 23s Details CI / sanitizers (address) (pull_request) Successful in 35s Details CI / sanitizers (undefined) (pull_request) Successful in 36s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 31s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details	2026-08-01 18:14:55 +02:00
TapTap	5eaea9d92e	refactor: extract CLI parser helpers, fix validation bugs CI / lint (pull_request) Successful in 16s Details CI / sanitizers (undefined) (pull_request) Successful in 37s Details CI / sanitizers (address) (pull_request) Successful in 39s Details CI / fuzz-build (pull_request) Successful in 14s Details CI / coverage (pull_request) Successful in 32s Details CI / build-and-test (pull_request) Successful in 1m15s Details CI / valgrind (pull_request) Successful in 33s Details - Add set_string_option(), set_positive_int_option(), set_nonneg_int_option() helpers to eliminate duplicated alloc/free/assign patterns - Replace 14 string-option branches with set_string_option() calls - Replace 7 integer-option branches with set_positive/nonneg_int_option() - Fix --info/--debug: replace atoi() with validated parse - Fix --max-size/--min-size: add strtoull() error checking - Fix --chunk-size: validate input with error message on failure	2026-08-01 18:12:41 +02:00