From vinschen at redhat.com Mon Jan 26 11:24:56 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 12:24:56 +0100 Subject: [Tcsh] [PATCH] sh.func.c: handle RLIMIT_AS on Cygwin Message-ID: <20260126112456.387466-1-vinschen@redhat.com> The preprocessor expression only handles RLIMIT_AS on Linux, but it's defined on Cygwin as well. --- sh.func.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sh.func.c b/sh.func.c index 413bcb024877..6455e339cc29 100644 --- a/sh.func.c +++ b/sh.func.c @@ -1859,7 +1859,7 @@ doumask(Char **v, struct command *c) # endif # endif /* SYSVREL > 3 && BSDLIMIT */ -# if (defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) +# if (defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) || defined(__CYGWIN__) # if defined(RLIMIT_AS) && !defined(RLIMIT_VMEM) # define RLIMIT_VMEM RLIMIT_AS # endif -- 2.52.0 From vinschen at redhat.com Mon Jan 26 11:28:43 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 12:28:43 +0100 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message Message-ID: <20260126112850.388697-1-vinschen@redhat.com> The expression is xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname, lp->limname, op, type, strerror(err)) but the localized strings are only equivalent to the part up to the parentheses, thus neglecting to print the strerror text. --- nls/C/set15 | 2 +- nls/et/set15 | 2 +- nls/finnish/set15 | 2 +- nls/french/set15 | 2 +- nls/german/set15 | 2 +- nls/greek/set15 | 2 +- nls/italian/set15 | 2 +- nls/ja/set15 | 2 +- nls/pl/set15 | 2 +- nls/russian/set15 | 2 +- nls/spanish/set15 | 2 +- nls/ukrainian/set15 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nls/C/set15 b/nls/C/set15 index 035d8182654d..50592c45e061 100644 --- a/nls/C/set15 +++ b/nls/C/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: Can't %s%s limit\n +1 %s: %s: Can't %s%s limit (%s)\n 2 remove 3 set 4 \040hard diff --git a/nls/et/set15 b/nls/et/set15 index e737d2d4d171..0ddc504d837c 100644 --- a/nls/et/set15 +++ b/nls/et/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: Ei ?nnestu %s%s piirangut\n +1 %s: %s: Ei ?nnestu %s%s piirangut (%s)\n 2 eemaldada 3 seada 4 \040k?va diff --git a/nls/finnish/set15 b/nls/finnish/set15 index 5f7d5b92a1cc..7f14457fec85 100644 --- a/nls/finnish/set15 +++ b/nls/finnish/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: rajoitusta ei voida %s %s\n +1 %s: %s: rajoitusta ei voida %s%s (%s)\n 2 poistaa 3 asettaa 4 ehdottomaksi diff --git a/nls/french/set15 b/nls/french/set15 index d3c482cb95e0..f518a86db3f8 100644 --- a/nls/french/set15 +++ b/nls/french/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: ne peut %s la limite%s\n +1 %s: %s: ne peut %s la limite%s (%s)\n 2 enlever 3 positionner 4 mat?rielle diff --git a/nls/german/set15 b/nls/german/set15 index 8148bbffea31..90d6b74e5bac 100644 --- a/nls/german/set15 +++ b/nls/german/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: Kann Begrenzung nicht %s%s\n +1 %s: %s: Kann Begrenzung nicht %s%s (%s)\n 2 l?schen 3 setzen 4 \040(hard limit) diff --git a/nls/greek/set15 b/nls/greek/set15 index 50569a848ee3..ed051da3c285 100644 --- a/nls/greek/set15 +++ b/nls/greek/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: ?? ????? ?? %s??%s ????\n +1 %s: %s: ?? ????? ?? %s??%s ???? (%s)\n 2 ???????? 3 ???? 4 \040??????? diff --git a/nls/italian/set15 b/nls/italian/set15 index 0cf04af77ec2..b37f1234efe2 100644 --- a/nls/italian/set15 +++ b/nls/italian/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: non si pu? %s il limite%s\n +1 %s: %s: non si pu? %s il limite%s (%s)\n 2 eliminare 3 modificare 4 \040fisico diff --git a/nls/ja/set15 b/nls/ja/set15 index 781616f0a228..258a7ffea7ff 100644 --- a/nls/ja/set15 +++ b/nls/ja/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: %s ?????. (%s ??)\n +1 %s: %s: %s ?????. (%s ??) (%s)\n 2 ?? 3 ?? 4 \040??? diff --git a/nls/pl/set15 b/nls/pl/set15 index 6067cd300f4e..94698888f4fc 100644 --- a/nls/pl/set15 +++ b/nls/pl/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: Nie mog? limitowa? %s%s\n +1 %s: %s: Nie mog? limitowa? %s%s (%s)\n 2 usu? 3 ustaw 4 \040twardy diff --git a/nls/russian/set15 b/nls/russian/set15 index a045bc553377..4c83a55ea03b 100644 --- a/nls/russian/set15 +++ b/nls/russian/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: ?? ???? %s%s ??????\n +1 %s: %s: ?? ???? %s%s ?????? (%s)\n 2 ??????? 3 ?????????? 4 \040??????? diff --git a/nls/spanish/set15 b/nls/spanish/set15 index 4637850242fc..bdf38afcbe72 100644 --- a/nls/spanish/set15 +++ b/nls/spanish/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: No se puede %s el l?mite %s\n +1 %s: %s: No se puede %s el l?mite %s (%s)\n 2 quitar 3 poner 4 \040(hard-limit) diff --git a/nls/ukrainian/set15 b/nls/ukrainian/set15 index 658ab1ea1abe..d25054a652ec 100644 --- a/nls/ukrainian/set15 +++ b/nls/ukrainian/set15 @@ -1,6 +1,6 @@ $ sh.func.c $set 15 -1 %s: %s: ?? ???? %s%s ?????\n +1 %s: %s: ?? ???? %s%s ????? (%s)\n 2 ????? 3 ????????? 4 \040???????? -- 2.52.0 From vinschen at redhat.com Mon Jan 26 11:57:59 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 12:57:59 +0100 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: <20260126112850.388697-1-vinschen@redhat.com> References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: On Jan 26 12:28, Corinna Vinschen wrote: > The expression is > > xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname, > lp->limname, op, type, strerror(err)) > > but the localized strings are only equivalent to the part up to the > parentheses, thus neglecting to print the strerror text. Btw., Cygwin is using the NetBSD gencat.c verbatim to create the message catalog files. The nls/C/set15 file contains this line: 4 \040hard When I perform a `make install.catalogs' and restart tcsh, the output of this error message doesn't print the space, e.g. limit: maxproc: Can't sethard limit (Operation not permitted) ^^ It turns out that this is a tiny bug in NetBSD gencat: diff --git a/winsup/utils/gencat.c b/winsup/utils/gencat.c index a583a884381f..9902ef75514c 100644 --- a/winsup/utils/gencat.c +++ b/winsup/utils/gencat.c @@ -374,6 +374,7 @@ getmsg(int fd, char *cptr, char quote) *tptr += (*cptr - '0'); ++cptr; } + ++tptr; } else { warning(cptr, "unrecognized escape sequence"); } That means, the space is correctly created, but because tptr doesn't move forward afterwards, the sapce is simply overwritten with the next character. Does anybody here have a better contact to, or is even a part of to the NetBSD team and would be willing to push this upstream? Thanks, Corinna From vinschen at redhat.com Mon Jan 26 14:41:14 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 15:41:14 +0100 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: On Jan 26 12:57, Corinna Vinschen wrote: > On Jan 26 12:28, Corinna Vinschen wrote: > > The expression is > > > > xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname, > > lp->limname, op, type, strerror(err)) > > > > but the localized strings are only equivalent to the part up to the > > parentheses, thus neglecting to print the strerror text. > > Btw., Cygwin is using the NetBSD gencat.c verbatim to create the message > catalog files. The nls/C/set15 file contains this line: > > 4 \040hard > > When I perform a `make install.catalogs' and restart tcsh, the output > of this error message doesn't print the space, e.g. > > limit: maxproc: Can't sethard limit (Operation not permitted) > ^^ > > It turns out that this is a tiny bug in NetBSD gencat: > > diff --git a/winsup/utils/gencat.c b/winsup/utils/gencat.c > index a583a884381f..9902ef75514c 100644 > --- a/winsup/utils/gencat.c > +++ b/winsup/utils/gencat.c > @@ -374,6 +374,7 @@ getmsg(int fd, char *cptr, char quote) > *tptr += (*cptr - '0'); > ++cptr; > } > + ++tptr; > } else { > warning(cptr, "unrecognized escape sequence"); > } > > That means, the space is correctly created, but because tptr doesn't > move forward afterwards, the sapce is simply overwritten with the next > character. > > Does anybody here have a better contact to, or is even a part of to the > NetBSD team and would be willing to push this upstream? Never mind, I just created a bug report on https://www.netbsd.org/ Corinna From christos at zoulas.com Mon Jan 26 16:16:28 2026 From: christos at zoulas.com (Christos Zoulas) Date: Mon, 26 Jan 2026 11:16:28 -0500 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: Got all 3, thanks! christos > On Jan 26, 2026, at 9:41?AM, Corinna Vinschen wrote: > > On Jan 26 12:57, Corinna Vinschen wrote: >> On Jan 26 12:28, Corinna Vinschen wrote: >>> The expression is >>> >>> xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname, >>> lp->limname, op, type, strerror(err)) >>> >>> but the localized strings are only equivalent to the part up to the >>> parentheses, thus neglecting to print the strerror text. >> >> Btw., Cygwin is using the NetBSD gencat.c verbatim to create the message >> catalog files. The nls/C/set15 file contains this line: >> >> 4 \040hard >> >> When I perform a `make install.catalogs' and restart tcsh, the output >> of this error message doesn't print the space, e.g. >> >> limit: maxproc: Can't sethard limit (Operation not permitted) >> ^^ >> >> It turns out that this is a tiny bug in NetBSD gencat: >> >> diff --git a/winsup/utils/gencat.c b/winsup/utils/gencat.c >> index a583a884381f..9902ef75514c 100644 >> --- a/winsup/utils/gencat.c >> +++ b/winsup/utils/gencat.c >> @@ -374,6 +374,7 @@ getmsg(int fd, char *cptr, char quote) >> *tptr += (*cptr - '0'); >> ++cptr; >> } >> + ++tptr; >> } else { >> warning(cptr, "unrecognized escape sequence"); >> } >> >> That means, the space is correctly created, but because tptr doesn't >> move forward afterwards, the sapce is simply overwritten with the next >> character. >> >> Does anybody here have a better contact to, or is even a part of to the >> NetBSD team and would be willing to push this upstream? > > Never mind, I just created a bug report on https://www.netbsd.org/ > > Corinna > > -- > Tcsh mailing list > Tcsh at astron.com > https://mailman.astron.com/mailman/listinfo/tcsh -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 235 bytes Desc: Message signed with OpenPGP URL: From vinschen at redhat.com Mon Jan 26 16:51:02 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 17:51:02 +0100 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: On Jan 26 11:16, Christos Zoulas wrote: > Got all 3, thanks! Thank you, but I don't see the NetBSD gencat patch in the trunk of https://github.com/NetBSD/src. Is that the wrong branch? Thanks, Corinna From kim at netbsd.org Mon Jan 26 21:59:09 2026 From: kim at netbsd.org (Kimmo Suominen) Date: Mon, 26 Jan 2026 23:59:09 +0200 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: On Mon, Jan 26, 2026 at 05:51:02PM +0100, Corinna Vinschen wrote: > On Jan 26 11:16, Christos Zoulas wrote: > > Got all 3, thanks! > > Thank you, but I don't see the NetBSD gencat patch in the trunk of > https://github.com/NetBSD/src. Is that the wrong branch? There's a processing delay for it to get from CVS to GitHub. :) https://github.com/NetBSD/src/commit/25f505616e424be88b68e89560e9babc5923deed Kind regards, + Kimmo From vinschen at redhat.com Mon Jan 26 22:46:42 2026 From: vinschen at redhat.com (Corinna Vinschen) Date: Mon, 26 Jan 2026 23:46:42 +0100 Subject: [Tcsh] [PATCH] nls: fix localized string for limit error message In-Reply-To: References: <20260126112850.388697-1-vinschen@redhat.com> Message-ID: On Jan 26 23:59, Kimmo Suominen wrote: > On Mon, Jan 26, 2026 at 05:51:02PM +0100, Corinna Vinschen wrote: > > On Jan 26 11:16, Christos Zoulas wrote: > > > Got all 3, thanks! > > > > Thank you, but I don't see the NetBSD gencat patch in the trunk of > > https://github.com/NetBSD/src. Is that the wrong branch? > > There's a processing delay for it to get from CVS to GitHub. :) > > https://github.com/NetBSD/src/commit/25f505616e424be88b68e89560e9babc5923deed Ah, ok, thanks! Corinna