Skip to content

fix(libc): guard _jp2uc_l/_uc2jp_l calls in towctrans_l with _MB_CAPABLE #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esaurez wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(libc): guard _jp2uc_l/_uc2jp_l calls in towctrans_l with _MB_CAPABLE #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions newlib/libc/ctype/towctrans_l.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
//#include <errno.h>
#include "local.h"

#ifdef _MB_CAPABLE

/*
struct caseconv_entry describes the case conversion behaviour
of a range of Unicode characters.
Expand Down Expand Up @@ -160,3 +162,27 @@ towctrans_l (wint_t c, wctrans_t w, struct __locale_t *locale)
else
return c;
}

#else /* !_MB_CAPABLE */

/* When _MB_CAPABLE is not defined, newlib does not compile the
JIS<->Unicode helpers (_jp2uc_l / _uc2jp_l) used above; their bodies
in jp2uc.c are wrapped in #ifdef _MB_CAPABLE. In this configuration
the sibling locale wrappers towlower_l / towupper_l do not call
towctrans_l at all -- they delegate directly to the narrow-ctype-
backed towlower / towupper (see towlower_l.c, towupper_l.c). Mirror
that behavior here so direct callers of towctrans / towctrans_l with
WCT_TOLOWER or WCT_TOUPPER see the same result as towlower_l /
towupper_l in the same configuration. */
wint_t
towctrans_l (wint_t c, wctrans_t w, struct __locale_t *locale)
{
(void) locale;
if (w == WCT_TOLOWER)
return towlower (c);
if (w == WCT_TOUPPER)
return towupper (c);
return c;
}

#endif /* _MB_CAPABLE */