From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: from zero.zsh.org (zero.zsh.org [IPv6:2a02:898:31:0:48:4558:7a:7368]) by inbox.vuxu.org (Postfix) with ESMTP id D2C0321EB7 for ; Wed, 10 Apr 2024 20:46:00 +0200 (CEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1712774760; b=OAjU8c1TT4pdbdoLdATUoYbZEjE0sxBqSD4GxTHKgO7Z1X9XGpfZxJPlq+rD2mkDmOr1j7gb2O dYXjZA+8gjHKMckQglX9B7GJi/fHtNVRVIHZPaABxpVN8CMXIpYFXqy7Ov7E/XQQQh5PcnDOim bgxmrnZoBqQrAm+aqEXZ380BLniiw5TQrGKY+jpyXVNL92YUOV9mIoGQdZ1lVWTnlvP2KccL7R mVU9+nvhFOZX8a6n5axvN/b79TPYer4M6o9W4WnzCvgf4Vq2GlHwovCEGSvwqTCgPq4FDfR6f2 VJOZgH4Eyl3ahI1w54caxxmel7PbSjpqWtO6Q9R0RvhUHw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f52.google.com) smtp.remote-ip=209.85.218.52; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1712774760; bh=yATnSvmD0s/06RuMTB14IsQgybmK2XohIT/d5KhRcZ8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:Cc:To:Subject: Message-ID:Date:From:In-Reply-To:References:MIME-Version:DKIM-Signature: DKIM-Signature; b=gcxc5DOD6QzlAjca0QAP1Q+rMYLoc3AzrPiNN8eixuc0Zbrn8NKHrI5m2/Htn2TnxP6YAdUD2M CP0EgALMDugsj4n7MrG4wGIr3/bPatod+mQ4ekVdTdfQpVXpzqAVC9Xpyu/b/3Rvjij/h8CGOf BpaLolfQuFXjcFv1K/4gjMUkgrdee4Lvk1zBq/GwICPIPTaHHzz/hcxxIFdiPYX5sQAeHgJVT1 QA9gYB5GollEsI2XVV/foPnbg2ECKvhUY1VuF2y/46Co3P+oIaAG7ndewqKv2TEz23QSmMLK72 ZEeew3Rpwr/fT9FPHeMoZhVqFoEZIdeN90pgD6rrMI2DAQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To:References: MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=uHg7WkD/HpzKgxajiodGhCVbnhZ3D/l/ZPMDUPXBccQ=; b=P06RvYyveQQ4ZPYulcnO/5h3R+ E9EorYD5wWnVILduTE21y5+YVY4LDl8JGIZZkewd6FK3sibSv2Cd0m9deHvm+lAIQKISFcH5rO7aw pCqzeJrkttCiXHWG3iih1t9Ma0wwd/Rw2hYP5dbBWhiG42XZAorfrOrsW/K49fc4ffQnypsJ3f10/ pRvT3s7uzO+qh9lrGX7cl4U+74kkVi1pVze0ne65kHrIEyAEIbJ25CKh+xutMqLXCnIgJOw2ancXA bzjFHRCGHj7N7jjg/d7Bn+LcSdDsMKjWpa3wVeK8LM/QwNSurA3mDxJ/dZL1Qg8K1VE69aweXf/og FxPJLCjg==; Received: by zero.zsh.org with local id 1rucxM-000MO6-7p; Wed, 10 Apr 2024 18:46:00 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f52.google.com) smtp.remote-ip=209.85.218.52; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-ej1-f52.google.com ([209.85.218.52]:54634) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1rucx2-000M3U-64; Wed, 10 Apr 2024 18:45:41 +0000 Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a51c37a5025so529897266b.1 for ; Wed, 10 Apr 2024 11:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712774739; x=1713379539; darn=zsh.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=uHg7WkD/HpzKgxajiodGhCVbnhZ3D/l/ZPMDUPXBccQ=; b=DRWb+8lVNaw0xFjeQrtKs945npG2vjA1ZsTHCKq1V3IpIkeNymwnFPxokQF+zzukVy G1PNLzikqLluPCNq6NXPh8OlIZCEdekVViP0BbOh3TeiWg7X1K8iZCdIiVJKRfwpuUdJ +5+l1HLF9d8fT+K009T0VahXbBDcuQta/sBTiu5DYeepclp8dBy06wQnPyhkEsold1GI vtoD/5PMwULtINyErjWB28xO2JjJLJirVWoFQcTr6Vn6V8fTxLWLAjVZPcRkZbdAHOBz xHlDECsaaw7o2glQaA1dvECuvu/gGG/mSKrbi1x7bZdk4pnnaWOfs2CAv5tsZIKxwyzD b+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712774739; x=1713379539; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uHg7WkD/HpzKgxajiodGhCVbnhZ3D/l/ZPMDUPXBccQ=; b=FTJX3GjJ6vyHgMqdM6Cr1vb++E+8tZbdPiElTL5Ti0MnGpjJioyuj9oz9qaf91oNo3 xRyWqRO49401mvq5o6hzIHYhbvci1bzO1vYfhVK42Q4EHxBkgGiPLNRTsD85I3NHE+kO tYYMIttaBvN1JQwqEnsNvQeiZZwmB8dYs13n95wUXVRdFP4AMtK0Nb9hySHebziiX370 0U+21gzAfNAK47NJbhoxDBgjYc4LGsYKGoy8103U37XUkjZiAk66xH5hVyF+lZfOLa1/ q548le9iyvZf+RSqvcP04fCDIu7ZjgJVaq2S+DHGTBrh8Wj6jIigjOfH/Z48MxBavdsk 54Lw== X-Gm-Message-State: AOJu0YxOsC//uY+MyEJkoU4mqp2RIO4CFUaqxeAo4IZGBtBkUrLdZqxm 1GyNRawXUkx2nSNE/svEh2dR3IQ9qNCULxnEf0S1EPsTmul50yOaNkt8QmwZZrCVWunL1LGAMPX a6TF4pOTnEMsr0VEjvAYLq52R41U= X-Google-Smtp-Source: AGHT+IHfKXtk5WsXMYotCvwomRhsBc2LJ+11pgZ54ABNfbblRPEYPhG7GwrYbaKIMG3W57SqltDvuyTWR/EVYvRQPWE= X-Received: by 2002:a17:906:b217:b0:a51:ddd3:6a4c with SMTP id p23-20020a170906b21700b00a51ddd36a4cmr1970653ejz.42.1712774739027; Wed, 10 Apr 2024 11:45:39 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Mikael Magnusson Date: Wed, 10 Apr 2024 20:45:24 +0200 Message-ID: Subject: Re: [PATCH] remote files completion: remove double-escaping To: Lyn Fugmann Cc: zsh-workers@zsh.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Seq: 52885 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: On Wed, Apr 10, 2024 at 12:47=E2=80=AFPM Lyn Fugmann wrote: > > Removes the double escaping in the remote files completion. This affects = rsync and scp. > For example, instead of a space character in a remote filename turning in= to `\\\ `, it will now correctly turn into `\ `. > While scp apparently works with either one, rsync requires the latter sin= ce version 3.2.4[1] (unless the legacy behavior is explicitly enabled). > This has been a problem for almost two years now. This should probably be behind a zstyle (I guess it's fine if it defaults to the new behavior), as currently this patch will break completion for older versions of scp and rsync. That way users can easily configure it per command or globally if they want. > diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_r= emote_files > index 93e1b7f43..4d4a7abbf 100644 > --- a/Completion/Unix/Type/_remote_files > +++ b/Completion/Unix/Type/_remote_files > @@ -60,10 +60,7 @@ if zstyle -T ":completion:${curcontext}:files" remote-= access; then > dirprefix=3D${dir}/ > fi > > - if [[ -z $QIPREFIX ]] > - then rempat=3D"${dirprefix}${PREFIX%%[^./][^/]#}\*" > - else rempat=3D"${dirprefix}${(q)PREFIX%%[^./][^/]#}\*" > - fi > + rempat=3D"${dirprefix}${(q)PREFIX%%[^./][^/]#}\*" > > # remote filenames > remfiles=3D(${(M)${(f)"$( > @@ -92,9 +89,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-a= ccess; then > while _tags; do > while _next_label remote-files expl ${suf:-remote directory}; do > [[ -n $suf ]] && > - compadd "$args[@]" "$expl[@]" -d remdispf -- ${(q)remdispf%[*= =3D|]} && ret=3D0 > + compadd "$args[@]" "$expl[@]" -d remdispf -- ${remdispf%[*=3D|= ]} && ret=3D0 > compadd ${suf:+-S/} $autoremove "$args[@]" "$expl[@]" -d remdispd = \ > - -- ${(q)remdispd%/} && ret=3D0 > + -- ${remdispd%/} && ret=3D0 > done > (( ret )) || return 0 > done --=20 Mikael Magnusson