From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-45265-ml=inbox.vuxu.org@zsh.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI,
	RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2
Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2])
	by inbox.vuxu.org (OpenSMTPD) with ESMTP id 69ce8227
	for <ml@inbox.vuxu.org>;
	Wed, 8 Jan 2020 10:41:09 +0000 (UTC)
Received: (qmail 21424 invoked by alias); 8 Jan 2020 10:40:34 -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: 45265
Received: (qmail 8977 invoked by uid 1010); 8 Jan 2020 10:40:34 -0000
X-Qmail-Scanner-Diagnostics: from rcpt-expgw.biglobe.ne.jp by f.primenet.com.au (envelope-from <takimoto-j@kba.biglobe.ne.jp>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.102.1/25684. spamassassin: 3.4.2.  
 Clear:RC:0(133.208.98.2):SA:0(-2.6/5.0):. 
 Processed in 1.015712 secs); 08 Jan 2020 10:40:34 -0000
X-Envelope-From: takimoto-j@kba.biglobe.ne.jp
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
Received-SPF: pass (ns1.primenet.com.au: SPF record at spf01.biglobe.ne.jp designates 133.208.98.2 as permitted sender)
X-Biglobe-Sender: <takimoto-j@kba.biglobe.ne.jp>
From: Jun T <takimoto-j@kba.biglobe.ne.jp>
Content-Type: text/plain;
	charset=us-ascii
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\))
Subject: [PATCH] find RLIM_NLIMITS correctly on Cygwin
Message-Id: <82F8CDE0-C95C-4D31-ABFC-EBB3C97799F3@kba.biglobe.ne.jp>
Date: Wed, 8 Jan 2020 19:39:58 +0900
To: zsh-workers@zsh.org
X-Mailer: Apple Mail (2.3445.104.11)
X-Biglobe-Spnum: 52616

On Cygwin, <sys/resource.h> has lines like:

#define RLIMIT_NLIMITS  7       /* upper bound of RLIMIT_* defines */
#define RLIM_NLIMITS    RLIMIT_NLIMITS

but rlimits.awk fails to find the value of RLIM_NLIMITS
(and sets ZSH_NLIMITS to zero).



diff --git a/Src/Builtins/rlimits.awk b/Src/Builtins/rlimits.awk
index e9c576c66..4cf960314 100644
--- a/Src/Builtins/rlimits.awk
+++ b/Src/Builtins/rlimits.awk
@@ -79,6 +79,12 @@ BEGIN {limidx = 0}
     split(limtail, tmp)
     nlimits = tmp[2]
 }
+# for Cygwin
+/^[\t ]*#[\t ]*define[\t ]*RLIM_NLIMITS[\t ]*RLIMIT_NLIMITS/ {
+    if (!nlimits && limrev["NLIMITS"]) {
+      nlimits = limrev["NLIMITS"]
+    }
+}
 
 END {
     if (limrev["MEMLOCK"] != "") {