external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix typeset -u/-l on NetBSD

Browse source 
On NetBSD, for some reason, the wctrans(3) and towctrans(3) C
library functions exist, but have no effect; the "toupper" and
"tolower" maps don't even translate case for ASCII, never mind wide
characters. This kills 'typeset -u' and 'typeset -l' on ksh, which
was the cause of most of the regression test failures on NetBSD.
Fallback versions for these functions are provided in init.c, but
were not being used on NetBSD because the feature test detected the
presence of these functions in the C library.

src/cmd/ksh93/features/locale:
- Replace the simple test for the presence of wctrans(3),
  towctrans(3), and the wctrans_t type by an actual feature test
  that checks that these functions not only compile, but are also
  capable of changing an ASCII 'q' to upper case and back again.

src/cmd/ksh93/sh/init.c: towctrans():
- Add wide character support to the fallback function, for whatever
  good that may do; on NetBSD, the wide-character towupper(3) and
  towlower(3) functions only change case for ASCII.
This commit is contained in:
Martijn Dekker 2021-05-18 12:39:24 +02:00
parent 7cb9318e02
commit c828ea8d0d
4 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -68,8 +68,6 @@ Enhancements to do:
______
Fix regression test failures:
- There are many regression test failures on NetBSD.
- There are some serious regression test failures on OpenBSD when ksh
is compiled with AST vmalloc disabled, so the system standard malloc(3)
is used. These probably represent real ksh93 bugs exposed by OpenBSD's

3
src/cmd/ksh93/README
View file

@ -254,7 +254,8 @@ failures (crashes, and/or important functionality does not work).
* illumos: OmniOS 2020-08-19 (gcc) on x86_64
macOS 10.13.6 (High Sierra) on x86_64
macOS 10.14.6 (Mojave) on x86_64
*** NetBSD 8.1 and 9.0 on x86_64
* NetBSD 8.1 on x86_64
* NetBSD 9.2 on x86_64
* OpenBSD 6.8 on x86_64
** QNX 6.5.0 on i386
* Solaris 11.4 (gcc) on x86_64

22
src/cmd/ksh93/features/locale
View file

@ -1,7 +1,25 @@
hdr locale,wchar,wctype
lib locale,localeconv,wctype,iswctype,iswblank
lib wctrans,towctrans wctype.h
typ wctrans_t wctype.h
tst note{ do wctrans/towctrans work }end output{
/*
* On NetBSD, these functions exist, but simply have no effect for some reason.
* So instead of simple lib/typ tests, this custom test checks if they actually work.
*/
#include <stdio.h>
#include <wchar.h>
#include <wctype.h>
int main()
{
wctrans_t toupper = wctrans("toupper"), tolower = wctrans("tolower");
int r = towctrans('q',toupper) == 'Q' && towctrans('Q',tolower) == 'q';
printf("#define _lib_wctrans\t%d\n",r);
printf("#define _lib_towctrans\t%d\n",r);
printf("#define _typ_wctrans_t\t%d\n",r);
return !r;
}
}end
cat{
#if _PACKAGE_ast
# undef _hdr_locale

10
src/cmd/ksh93/sh/init.c
View file

@ -76,6 +76,16 @@ static wctrans_t wctrans(const char *name)
#define towctrans sh_towctrans
static int towctrans(int c, wctrans_t t)
{
#if _lib_towupper && _lib_towlower
if(mbwide())
{
if(t==1 && iswupper((wint_t)c))
c = (int)towlower((wint_t)c);
else if(t==2 && iswlower((wint_t)c))
c = (int)towupper((wint_t)c);
}
else
#endif
if(t==1 && isupper(c))
c = tolower(c);
else if(t==2 && islower(c))