fix(client): forward --iconv to remote rsync server args#3565
Merged
Conversation
The remote invocation builder did not include --iconv among the long-form flags it forwards to the spawned `rsync --server`, so the remote peer ran without an iconv context and emitted raw bytes on the wire. This closes gap 1 of the standalone:iconv-local-ssh known failure. Mapping mirrors upstream options.c:2716-2723 exactly: when iconv_opt contains a comma, only the post-comma half (the remote charset) is forwarded; without a comma the whole spec is forwarded; --iconv=- and the default forward nothing because options.c:2052-2054 nulls iconv_opt before this branch runs. This change does NOT close the standalone:iconv-local-ssh KF on its own: gap 2 (the UTF-8 wire mismatch on the file-list side) and the iconv audit findings 1, 2, 3, and 5 remain open. The KF entry in tools/ci/known_failures.conf stays unchanged.
oferchen
added a commit
that referenced
this pull request
May 5, 2026
The remote invocation builder did not include --iconv among the long-form flags it forwards to the spawned `rsync --server`, so the remote peer ran without an iconv context and emitted raw bytes on the wire. This closes gap 1 of the standalone:iconv-local-ssh known failure. Mapping mirrors upstream options.c:2716-2723 exactly: when iconv_opt contains a comma, only the post-comma half (the remote charset) is forwarded; without a comma the whole spec is forwarded; --iconv=- and the default forward nothing because options.c:2052-2054 nulls iconv_opt before this branch runs. This change does NOT close the standalone:iconv-local-ssh KF on its own: gap 2 (the UTF-8 wire mismatch on the file-list side) and the iconv audit findings 1, 2, 3, and 5 remain open. The KF entry in tools/ci/known_failures.conf stays unchanged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds
--iconvto the long-form server-args forwarded byRemoteInvocationBuilder::append_long_form_args. Without this, the spawnedrsync --serverran with no iconv context and emitted raw bytes on the wire - gap 1 of thestandalone:iconv-local-sshknown failure.The mapping mirrors upstream
options.c:2716-2723exactly:IconvSettingvariantUnspecifiedDisablediconv_optatoptions.c:2052-2054)LocaleDefault--iconv=.Explicit { local, remote: Some(r) }--iconv={r}(post-comma half only)Explicit { local, remote: None }--iconv={local}(no comma => forward whole)Five new unit tests cover each row.
Upstream Reference
Scope: this does NOT close the KF
This is a focused fix for gap 1 only. The
standalone:iconv-local-sshknown failure stays open because:The KF entry in
tools/ci/known_failures.confis intentionally unchanged.Test plan
iconv_*tests incrates/core/src/client/remote/invocation/tests.rsstandalone:iconv-local-sshremains inKNOWN_FAILURES(intentional)