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=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI 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 3D5F32F9E7 for ; Mon, 16 Sep 2024 10:16:24 +0200 (CEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1726474584; b=aCeWkcyJFVTYAFEZhqCHRIpez6d7Vidga1mZU6E3l46TrWqJSAQuAl/5ph6Q+OCh/dP8zoEESa 5AqZ+54pQKj/HExvHoibT74lQVluLMBaVmj1/kmUek9m56m9Ls7eeyHZJBuIhHZ6TXIVqmARxz TafXWuWKOIm7dy5wwomurlOWigXuMDHwauZg0ClW/P3lfJB7VZ13yaFhGZ/khuFjZjHJCq0V0S LfwVElm2NcAAf5L9weu7uzVxk6iz+pBJsR3E90JtDygHOKZFzX4xPHlMLc3KMCijrbPooXGx7h 7EXq1yFD0x8/vR17bGzhl9wFLnZ3BaVlfovYRLqur37XJA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mout-p-101.mailbox.org) smtp.remote-ip=80.241.56.151; dkim=pass header.d=sksm.net header.s=MBO0001 header.a=rsa-sha256; dmarc=pass header.from=sksm.net; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1726474584; bh=QeK6FGmdpyQwfyJiSuL1s9Ux89NrfrtJUrU6voRIk8M=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:To:From:DKIM-Signature:DKIM-Signature; b=R86fux0oFW0fSAEsgUhPVtd0dihstVpJgda//rninZ2XRHlLfSeRUGTqk22Xc4SgLLkU8xcECw V84D++5XbKvDQ5DGCUHYwn/04fv1m8ObKbUnUKYLiDKgICsi3XqeIkxCYhu/7mMZRhYdRvcXVF bM61OY5630mkp0yBXDDX+BCBNtc4J1V0ELj41N0nuYoeFsCOKXHJvtRyViXN1GjAMN4eoRMYqs kSpWZzBsa8KGAiDkHBJJGfKFjR3Sq5Gh96BDi0FGAMFpCvjRwYAevsjDQ9QWdHWyHgNuZH9TOp Skd1GJP6YUTbhafaMIglqxxAnxQ2fPV2nglyzHlDa6uKzw==; 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: MIME-Version:Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=E9AG+yMOekqmmPYkpE9dwFjEHv9VllGIjMc0jIqKqnQ=; b=lHbUTViHHs46YrOn+Nmd2TrpkX tc0fGQ3XcFultSFWz2U/DTtPVIQ8gYokP3lTG73Iy0My+IE4x5UzduU4UYKNpVTAwuEvhtUQfij+O kN9MRKZ6OKgI/y4vLlE7yC2PP0thaeDoXMc01ELDVhU2ww1rL4Ebm12PHRzX7jcbIdEbYW3RhivCi OsJenVq7BaU8Ff1kpaMgB3cw0ntS0NsHR3hrv7YlljZqnYZUmZ8pxF0DiQe47Do8RRRBudYkFEBrU iBJ9BNa4fa9dUpPL6LBaxoqBjJCAvfUkE6iGGxr9To0UIZ+Jd2Y31BaB/aJDWeTVkKR/LkC4kGssU +fRH9eLA==; Received: by zero.zsh.org with local id 1sq6uF-0000aW-QI; Mon, 16 Sep 2024 08:16:23 +0000 Authentication-Results: zsh.org; iprev=pass (mout-p-101.mailbox.org) smtp.remote-ip=80.241.56.151; dkim=pass header.d=sksm.net header.s=MBO0001 header.a=rsa-sha256; dmarc=pass header.from=sksm.net; arc=none Received: from mout-p-101.mailbox.org ([80.241.56.151]:38906) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1sq6u1-0000Is-3r; Mon, 16 Sep 2024 08:16:10 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4X6d5t69RJz9sWN for ; Mon, 16 Sep 2024 10:16:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sksm.net; s=MBO0001; t=1726474562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=E9AG+yMOekqmmPYkpE9dwFjEHv9VllGIjMc0jIqKqnQ=; b=bZ20rpFKpkcwGJE//2DJ5HSHjW/Dwa0MtlMPuQUaRay2S0XiiBRn8leGHDbw4qPBFX32HN hvb43nEzpOCj1Gq3U7S5hZIIkpI0w5qMYb31zdT+eQQoaVIjxappEZ40MiEweCIUlImyin uKHpkrCnWcNEMRG6fKjQpu7j4OeX04pVvwllpGuHwaYyFNMiVKky4tYM2UoM7UeU4KJtKq bxbi30BbdReNbP54icNlZYzxRreMPWGD5PjdFVStMaZDa5bp/vvd5J85NknJuKMKM23B+p A5FUEANNxjIKnrS8VvUpUPrBEiJuBZ8kJMNZBVu6EQTG8oo9dB19b3/MTihgVA== From: Philip Sequeira To: zsh-workers@zsh.org Subject: [PATCH] fix completion for chmod/chown --reference with escaped filename Date: Mon, 16 Sep 2024 04:13:38 -0400 Message-ID: <20240916081338.587922-1-qmega@sksm.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 53095 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: --- Completion/Unix/Command/_chmod | 4 ++-- Completion/Unix/Command/_chown | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Completion/Unix/Command/_chmod b/Completion/Unix/Command/_chmod index 42e3fa63b..693f348dc 100644 --- a/Completion/Unix/Command/_chmod +++ b/Completion/Unix/Command/_chmod @@ -67,13 +67,13 @@ case "$variant" in ;; esac -_arguments -C -s -S $aopts "$args[@]" && ret=0 +_arguments -C -s -S -0 $aopts "$args[@]" && ret=0 case "$state" in files) if [[ -n $opt_args[--reference] ]]; then zmodload -F zsh/stat b:zstat 2>/dev/null - typeset -i8 ref=$(zstat +mode $opt_args[--reference]) + typeset -i8 ref=$(zstat +mode $opt_args[--reference]:Q) _wanted files expl file _files -g "*(-.^f${ref#??})" && ret=0 elif [[ $line[1] = [0-7]## ]]; then _wanted files expl file _files -g "*(-.^f$line[1])" && ret=0 diff --git a/Completion/Unix/Command/_chown b/Completion/Unix/Command/_chown index 4362d6e75..bcc6aec2f 100644 --- a/Completion/Unix/Command/_chown +++ b/Completion/Unix/Command/_chown @@ -71,7 +71,7 @@ case "$variant" in esac (( $+words[(r)--reference*] )) || args+=( '(--reference)1: :->owner' ) -_arguments -C -s -S $aopts "$args[@]" '*: :->files' && ret=0 +_arguments -C -s -S -0 $aopts "$args[@]" '*: :->files' && ret=0 case $state in owner) @@ -95,8 +95,8 @@ case $state in (( $+opt_args[-h] || $+opt_args[--no-dereference] )) || deref="-" if (( $+opt_args[--reference] )); then zmodload -F zsh/stat b:zstat 2>/dev/null - usr=$(zstat +uid $opt_args[--reference]) - grp=$(zstat +gid $opt_args[--reference]) + usr=$(zstat +uid $opt_args[--reference]:Q) + grp=$(zstat +gid $opt_args[--reference]:Q) _wanted files expl file _files -g "*($deref^u$usr,$deref^g$grp)" && ret=0 return ret fi -- 2.46.0