From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12323 invoked by alias); 3 Nov 2009 19:03:15 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 27344 Received: (qmail 5495 invoked from network); 3 Nov 2009 19:03:12 -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.3 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.google.com designates 209.85.219.209 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :in-reply-to:message-id:references:user-agent:mime-version :content-type; bh=0jP0hHsoqjiwpS/DvmppXYxV7SHVZUKKTZ7imUmjyCw=; b=I03c5UzwWGfIvqNlU3jGTzCXEgS62S5X6I3wFpB/9AFMo0e0CAKiU1Oxz2TI1vs0uL sTDTpus5bA8WaQhznAJXHt/qrI2r2Vt+FDrT2II+uBdxUu5pfCo3XMRSsC1KHYbTHFyY vmHpyLEpdEKqv8gTtB5IrvrIDbD8ZKorgb2V8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:in-reply-to:message-id:references:user-agent :mime-version:content-type; b=IQHdVGmZkXIKpbXm5lfh7d1ySvy83MvXUnXgwtli3T/hMzKoJGHec7SPSGvbskmCGY +SB10e+lxyUdkPWX5JruDn2l4IkbCvOpr86FrMfm2Nf1TwO01HORhmHw0nyFzggduFkz Urf0SNaAdVLO2WYKIOtJvguC0DBErEQnaY5fk= Date: Tue, 3 Nov 2009 19:56:22 +0100 (CET) From: Mikael Magnusson To: zsh workers Subject: [PATCH 2/4] attr: Make zlistattr return an array, zdelattr take several attrs In-Reply-To: Message-ID: References: <20090303121253.61f5e2ec@news01> <20090303163526.533995be@news01> <237967ef0903030851gc26620ficfc908628a4b3be2@mail.gmail.com> User-Agent: Alpine 2.00 (LNX ) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII --- Completion/Zsh/Command/_zattr | 2 +- Src/Modules/attr.c | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Completion/Zsh/Command/_zattr b/Completion/Zsh/Command/_zattr index 55804db..a6ae806 100644 --- a/Completion/Zsh/Command/_zattr +++ b/Completion/Zsh/Command/_zattr @@ -31,6 +31,6 @@ esac if [[ $state = attrs ]]; then if [[ -f $~line[1] ]]; then zlistattr $~line[1] REPLY - _wanted attrs expl 'attribute' compadd ${(0)REPLY} + _wanted attrs expl 'attribute' compadd $REPLY fi fi diff --git a/Src/Modules/attr.c b/Src/Modules/attr.c index cbf3d92..1a9c323 100644 --- a/Src/Modules/attr.c +++ b/Src/Modules/attr.c @@ -142,12 +142,16 @@ bin_delattr(char *nam, char **argv, Options ops, UNUSED(int func)) { int ret = 0, slen; int symlink = OPT_ISSET(ops, 'h'); + char *file = *argv; - unmetafy(*argv, &slen); - unmetafy(*(argv+1), NULL); - if (xremovexattr(*argv, *(argv+1), symlink)) { - zwarnnam(nam, "%s: %e", metafy(*argv, slen, META_NOALLOC), errno); - ret = 1; + unmetafy(file, &slen); + while (*++argv) { + unmetafy(*argv, NULL); + if (xremovexattr(file, *argv, symlink)) { + zwarnnam(nam, "%s: %e", metafy(file, slen, META_NOALLOC), errno); + ret = 1; + break; + } } return ret; } @@ -164,9 +168,26 @@ bin_listattr(char *nam, char **argv, Options ops, UNUSED(int func)) if (0 < (len = xlistxattr(*argv, value, 256, symlink))) { if (len < 256) { char *p = value; - if (*(argv+1)) - setsparam(*(argv+1), metafy(value, len, META_DUP)); - else while (p < &value[len]) { + if (*(argv+1)) { + if (strlen(value) + 1 == len) + setsparam(*(argv+1), metafy(value, len-1, META_DUP)); + else { + int arrlen = 0; + char **array = NULL, **arrptr = NULL; + + while (p < &value[len]) { + arrlen++; + p += strlen(p) + 1; + } + arrptr = array = (char **)zshcalloc((arrlen+1) * sizeof(char *)); + p = value; + while (p < &value[len]) { + *arrptr++ = metafy(p, -1, META_DUP); + p += strlen(p) + 1; + } + setaparam(*(argv+1), array); + } + } else while (p < &value[len]) { printf("%s\n", p); p += strlen(p) + 1; } @@ -183,7 +204,7 @@ bin_listattr(char *nam, char **argv, Options ops, UNUSED(int func)) static struct builtin bintab[] = { BUILTIN("zgetattr", 0, bin_getattr, 2, 3, 0, "h", NULL), BUILTIN("zsetattr", 0, bin_setattr, 3, 3, 0, "h", NULL), - BUILTIN("zdelattr", 0, bin_delattr, 2, 2, 0, "h", NULL), + BUILTIN("zdelattr", 0, bin_delattr, 2, -1, 0, "h", NULL), BUILTIN("zlistattr", 0, bin_listattr, 1, 2, 0, "h", NULL), }; -- 1.6.5