From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-42469-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 19590 invoked by alias); 16 Mar 2018 08:24:15 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 42469
Received: (qmail 4747 invoked by uid 1010); 16 Mar 2018 08:24:15 -0000
X-Qmail-Scanner-Diagnostics: from mail-wr0-f173.google.com by f.primenet.com.au (envelope-from <stephane.chazelas@gmail.com>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(209.85.128.173):SA:0(-1.9/5.0):. 
 Processed in 1.414222 secs); 16 Mar 2018 08:24:15 -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_H2,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:subject:message-id:mail-followup-to:references
         :mime-version:content-disposition:in-reply-to:user-agent;
        bh=sn8BIMcq7pBbX77nnNnmEMxHySOVSXVwHmoBtUPBE/k=;
        b=ccUbHmJ0g3EOuLdVXOQ7/3LGdRElfgzFiN+IE7tMdMF+6u6hO91xEZqQ01hP0GQtve
         FyQD1EeE0ldJYPAhA2tgY4Zu+vCFinzt/4/Ux/z1TVMQK2QfJ92weK3GdzUi3UMXYfoU
         2w45CvmLGn8G9P2vPwIBALwDxGZ4ejBg7rVFZtWy3AVF63xNDVNyRxb7CDZ9L2KwL3oH
         6gPgGKubyagxE9fKpT+cHasccjK8D5p7z9jsHLTu5d7IIPAn6elJsrZ4TQLbJOF+tHJy
         mXko7lwJ4iRUWtzwkDkLrU0M2jGu1Yy4s7hAAthIQtFjfRBccINLyXAzL9suf+kSGn2Z
         tFKw==
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:subject:message-id:mail-followup-to
         :references:mime-version:content-disposition:in-reply-to:user-agent;
        bh=sn8BIMcq7pBbX77nnNnmEMxHySOVSXVwHmoBtUPBE/k=;
        b=lRWkiWXiMqCCaGhOJag1sVf9R4xfinFPlc71+FPpwdn0GnvfREDVbW6Q94jAsXYLml
         6rP4l8FwAvEhtiZlikxMOTXF1k/48ga9bhoqAoRVWm46kWkAjgpLl/8uYu/VOsUjwoAT
         TDm2t/bpASZONHsMU7eJQr0d2snFyXxgbALlptWOTxet4eiVKAM86fJTQ9qY+4mv+ixs
         0/ctf3zfe3Z2e3z+qWNMnaNTLr32dlQFOF+ku40TLwX9JbJ5Tp6ZsL61UC8XXzuUfoXJ
         QA4EZ3Hy+6sDK89k+j+Htms1RnGenktktARrnY9bN0iGFGitv9Zpq6EuKfz1Vn2rPo71
         wQlw==
X-Gm-Message-State: AElRT7HU3POl/Zkw7QN6AuKzgpW+zrrtANfFEJ+kUn6EbMNQc3GjyadF
	xzIJ98ahNob8Ed8Jw3zXCVk=
X-Google-Smtp-Source: AG47ELtBWhrdawfE2j/x7td6QxilPOphqKMaJfritfH7Wzh5zDtRp0wWqnH+aDIPxRBkQYgnH17Szg==
X-Received: by 10.223.175.99 with SMTP id z90mr824944wrc.258.1521188649586;
        Fri, 16 Mar 2018 01:24:09 -0700 (PDT)
Date: Fri, 16 Mar 2018 08:24:08 +0000
From: Stephane Chazelas <stephane.chazelas@gmail.com>
To: Peter Stephenson <p.stephenson@samsung.com>,
	Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: $(<nofile) doesn't set $? to non-zero
Message-ID: <20180316082408.GA23397@chaz.gmail.com>
Mail-Followup-To: Peter Stephenson <p.stephenson@samsung.com>,
	Zsh hackers list <zsh-workers@zsh.org>
References: <CGME20180314103335epcas4p30222f0df02adda27cbddbe62075ff9ad@epcas4p3.samsung.com>
 <20180314103254.GA10404@chaz.gmail.com>
 <20180314105442.28c5554a@camnpupstephen>
 <20180314144248.GC10404@chaz.gmail.com>
 <20180314145004.6e4b971b@camnpupstephen>
 <20180315071204.GA10057@chaz.gmail.com>
 <20180315092305.6fe4ad17@camnpupstephen>
 <20180315111014.GA15289@chaz.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180315111014.GA15289@chaz.gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)

2018-03-15 11:10:14 +0000, Stephane Chazelas:
> 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.
[...]

And worse, didn't even test the obvious $(<existing-file).

I promiss I'll do a "make test" in the future before submitting
any patch! Sorry again.


diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c
index 771e5b5..7a90341 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 */
diff --git a/Src/exec.c b/Src/exec.c
index ce8cf8c..35b0bb1 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -4599,8 +4599,8 @@ readoutput(int in, int qt, int *readerror)
 	}
 	*ptr++ = c;
     }
-    if (readerror && ferror(fin))
-	*readerror = errno;
+    if (readerror)
+	*readerror = ferror(fin) ? errno : 0;
     fclose(fin);
     while (cnt && ptr[-1] == '\n')
 	ptr--, cnt--;