From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22490 invoked from network); 3 Mar 2009 18:01:06 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 3 Mar 2009 18:01:06 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 76076 invoked from network); 3 Mar 2009 18:01:01 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 3 Mar 2009 18:01:01 -0000 Received: (qmail 29252 invoked by alias); 3 Mar 2009 18:00:54 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 26679 Received: (qmail 29240 invoked from network); 3 Mar 2009 18:00:54 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 3 Mar 2009 18:00:54 -0000 Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.186]) by bifrost.dotsrc.org (Postfix) with ESMTP id 6FAE48058F82 for ; Tue, 3 Mar 2009 19:00:50 +0100 (CET) Received: by nf-out-0910.google.com with SMTP id c10so663285nfd.11 for ; Tue, 03 Mar 2009 10:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=AWJMsvAsI0XqTbTD06MMezd2Ep4CLm16R03vIgQGghI=; b=rMzTAyBzOQQNXwrxQzawuSmTfzxi3JYhARPEDlVM7somM3LiodGqOTPYpmn7cRxL7n Gxoo2fn6yUFi19wweVZEy7qfD32xEb5WiWZtHL7YG7ot/e5DZdTnXuhU2479erclEBZR MguaWIviCESRG2eJyYZ5CIUY0PyQIoczvcsdk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=JD0zkq8Kra4spHxtJ5QSNDl/Ivw2VT1B7N7nbPFl/xL8Iizvizh4dRr1FWFykRafc3 rN+8vlgA/9SCWHyelQRBMcj7cZ3lNVLzdj0+Jb3kHJCs58W0YERZstQy8V6WhHsuF2Zu hK+7lbsVbIDQWIPkuOoLlDZ09EwmjtHXJj8IE= MIME-Version: 1.0 Received: by 10.210.135.17 with SMTP id i17mr4326669ebd.87.1236103250142; Tue, 03 Mar 2009 10:00:50 -0800 (PST) In-Reply-To: <237967ef0903030955l1bbe4224p9d3f4a2bf1d04c77@mail.gmail.com> References: <27480.1236102218@csr.com> <237967ef0903030955l1bbe4224p9d3f4a2bf1d04c77@mail.gmail.com> Date: Tue, 3 Mar 2009 19:00:50 +0100 Message-ID: <237967ef0903031000x26b129e6kb0ef5d7eb8cfd134@mail.gmail.com> Subject: Re: PATCH: caps strings From: Mikael Magnusson To: Zsh hackers list Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV 0.92.1/9065/Tue Mar 3 11:43:41 2009 on bifrost X-Virus-Status: Clean 2009/3/3 Mikael Magnusson : > 2009/3/3 Peter Stephenson : >> This should fix string arguments to functions in the caps module as >> noticed by Mikael. It looks like all the returned strings are output >> directly by library calls so aren't affected. >> > I think the two zwarnnam calls with *argv needs them to be > re-metafy()ed. When i didn't do that in attr.c, I got output like > myutf8file\M-p. Ie, diff --git a/Src/Modules/cap.c b/Src/Modules/cap.c index 4242d44..3fb653b 100644 --- a/Src/Modules/cap.c +++ b/Src/Modules/cap.c @@ -72,11 +72,12 @@ do { char *result = NULL; ssize_t length; + unmetafy(*argv, NULL); cap_t caps = cap_get_file(*argv); if(caps) result = cap_to_text(caps, &length); if (!caps || !result) { - zwarnnam(nam, "%s: %e", *argv, errno); + zwarnnam(nam, "%s: %e", metafy(*argv, slen, META_NOALLOC), errno); ret = 1; } else printf("%s %s\n", *argv, result); @@ -101,7 +102,7 @@ do { unmetafy(*argv, NULL); if(cap_set_file(*argv, caps)) { - zwarnnam(nam, "%s: %e", *argv, errno); + zwarnnam(nam, "%s: %e", metafy(*argv, slen, META_NOALLOC), errno); ret = 1; } } while(*++argv); -- Mikael Magnusson