From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27103 invoked by alias); 15 Mar 2018 11:10:22 -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: List-Unsubscribe: X-Seq: 42468 Received: (qmail 23527 invoked by uid 1010); 15 Mar 2018 11:10:22 -0000 X-Qmail-Scanner-Diagnostics: from mail-wm0-f47.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(74.125.82.47):SA:0(-1.9/5.0):. Processed in 1.824999 secs); 15 Mar 2018 11:10:22 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: stephane.chazelas@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to:user-agent; bh=TbzArHjADhEXYhgHFTg1cKeR1jX/y0HxIxU8ga6K+Oo=; b=JVOik9fcMprIHeFoKOqbd6H9hsDwTCtrRdWwY3r88jG7Q/709A0+KW/iSzF9GA+Ful qIdayrKRzkTwlOub34ySjv6woKcUPsFz43JVWGlj6dGDXIpeLX1mO3z7dsvWBakq9nHH DOak/5laKUarMcDoa1d8H4wZwsX6dQFi6dQQgM51lga6ddxT1pK+6RlRys8s3BBwsNy1 fzQzoeKIMmCnMVEOFa6EgoDYJLD9ZqttWyKSYTCiSoxw9xNYKkV4bo8x2q5urcC0BauB fqNPiMkken46rTfv36HgvBjApkRygAP6+3i3kblCpV50Wkm9LesHUb9btzjNcdjFi5yG Xvwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=TbzArHjADhEXYhgHFTg1cKeR1jX/y0HxIxU8ga6K+Oo=; b=ZNvmtaR+3RWbREw6qOt5cBQPTiBASsJT6wT7jTMS3mq/NTmOL50XSlaZfrjqH6KLlk 6gvJEHfba7bsvkz7oBTcufC7zciEup5aWyUQyFEGOVAyRhrNiOfWtiS0Jhooq2IMuVVw trk+23nV5SKixWqSmzRwLnJvUUxNPdXObz9YJHgvhenPfi3gYdHsGvx9Mj9TxNEI98Eh 7rwUiiTm4aLBjoY/6ldEzXdDn/wh/Ete8HE9bAysr0+6h+ThNyMQiEuwmOqin0fRyLba d1AcNZartK6OBAK+1MX3VJPfKO3kvJt21IZuKi+RuGdawGMOHdCo8Il7FCGskRjSuUuQ gGDw== X-Gm-Message-State: AElRT7HjFSM0axQI5y3YZD1O+YFYiSrPuhm2SpQIAbADnpm0YbbAfU+s m++NHbHafQqOp91rGPVP4HA= X-Google-Smtp-Source: AG47ELurqs06EuOflfsX13bzD4/fBwtkZDI97eycl08dyoEDYaICngiB7s1Mgo+nQ1z9DWSurf2VNg== X-Received: by 10.28.106.19 with SMTP id f19mr4629347wmc.84.1521112216805; Thu, 15 Mar 2018 04:10:16 -0700 (PDT) Date: Thu, 15 Mar 2018 11:10:14 +0000 From: Stephane Chazelas To: Peter Stephenson Cc: Zsh hackers list Subject: Re: $( Mail-Followup-To: Peter Stephenson , Zsh hackers list References: <20180314103254.GA10404@chaz.gmail.com> <20180314105442.28c5554a@camnpupstephen> <20180314144248.GC10404@chaz.gmail.com> <20180314145004.6e4b971b@camnpupstephen> <20180315071204.GA10057@chaz.gmail.com> <20180315092305.6fe4ad17@camnpupstephen> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180315092305.6fe4ad17@camnpupstephen> User-Agent: Mutt/1.5.24 (2015-08-30) 2018-03-15 09:23:05 +0000, Peter Stephenson: [...] > That should be more consistent, thanks. I've committed it (minor > tweaks). [...] Sorry, my bad, I've left an unused variable in the patch. diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c index 771e5b5fc..7a903418f 100644 --- a/Src/Modules/mapfile.c +++ b/Src/Modules/mapfile.c @@ -197,9 +197,8 @@ get_contents(char *fname) val = NULL; if ((fd = open(fname, O_RDONLY | O_NOCTTY)) >= 0) { LinkList ll; - int readerror; - if ((ll = readoutput(fd, 1, &readerror))) + if ((ll = readoutput(fd, 1, 0))) val = peekfirst(ll); } #endif /* USE_MMAP */ I initially thought it would be nice to report errors when the file cannot be read in $mapfile[file], but then gave up on it on the ground that it was not done with mmap(). Now maybe it would make sense to report errors other than ENOENT here (even for the open)? But then that could become annoying for things like (($+mapfile[somefile])) (not that people should use that). -- Stephane