From: Eric Blake <eblake@redhat.com>
To: bug-gnulib@gnu.org
Cc: cygwin@cygwin.com
Subject: [PATCH] localename: Port to cygwin 2.6.
Date: Thu, 19 Jan 2017 20:31:00 -0000 [thread overview]
Message-ID: <20170119203057.13986-1-eblake@redhat.com> (raw)
Cygwin 2.6 introduced uselocale() and thread-local locales in general,
but lacks any way to get at the name of each portion of a locale_t
object short of peeking behind an opaque object. I'm proposing a
patch to add NL_LOCALE_NAME() to Cygwin patterned after glibc's
extension of the same name, but we might as well work around it
in the meantime.
* lib/localename.c (gl_locale_name_thread_unsafe): Add clause for
Cygwin.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
I won't actually push this to gnulib until I've sent the corresponding
newlib/Cygwin patch to add NL_LOCALE_NAME, and tweaked the commit
messages of both patches to refer to the appropriate mailing list
threads. But this was enough to get test-localename passing on
Cygwin again.
ChangeLog | 6 ++++++
lib/localename.c | 13 +++++++++++++
2 files changed, 19 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index e4339fc..f0e23a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-19 Eric Blake <eblake@redhat.com>
+
+ localename: Port to cygwin 2.6.
+ * lib/localename.c (gl_locale_name_thread_unsafe): Add clause for
+ Cygwin.
+
2017-01-17 Pádraig Brady <P@draigBrady.com>
parse-datetime: fix dependence on AC_PROG_SED
diff --git a/lib/localename.c b/lib/localename.c
index 33879e9..89ce889 100644
--- a/lib/localename.c
+++ b/lib/localename.c
@@ -2734,6 +2734,19 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
# elif defined __sun && HAVE_GETLOCALENAME_L
/* Solaris >= 12. */
return getlocalename_l (category, thread_locale);
+# elif defined __CYGWIN__
+ /* Cygwin < 2.6 lacks uselocale and thread-local locales altogether.
+ Cygwin <= 2.6.1 lacks NL_LOCALE_NAME, requiring peeking inside
+ an opaque struct. */
+# ifdef NL_LOCALE_NAME
+ return nl_langinfo_l (NL_LOCALE_NAME (category), thread_locale);
+# else
+ /* FIXME: Remove when we can assume new-enough Cygwin. */
+ struct __locale_t {
+ char categories[7][32];
+ };
+ return ((struct __locale_t *) thread_locale)->categories[category];
+# endif
# elif defined __ANDROID__
return MB_CUR_MAX == 4 ? "C.UTF-8" : "C";
# endif
--
2.9.3
--
Problem reports: http://cygwin.com/problems.html
FAQ: http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
next reply other threads:[~2017-01-19 20:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 20:31 Eric Blake [this message]
2017-01-20 2:47 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170119203057.13986-1-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=bug-gnulib@gnu.org \
--cc=cygwin@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).