Re: [PATCH] Cygwin: pty: Change the timing of set_locale() call again.

[Corinna Vinschen]

On Aug 15 12:23, Takashi Yano via Cygwin-patches wrote:
> - After commit 095972ce5b1d319915501a7e381802914bed790c, charset
>   conversion in mintty is broken if charset is set to other than
>   UTF-8. This seems to be caused because mintty does not set locale
>   yet at fork() call. This patch changes the timing of set_locale()
>   call again to avoid this issue.
> ---
>  winsup/cygwin/fhandler_tty.cc | 10 ++
>  winsup/cygwin/spawn.cc| 12 
>  2 files changed, 18 insertions(+), 4 deletions(-)

Pushed.


Thanks,
Corinna

[PATCH] Cygwin: pty: Change the timing of set_locale() call again.

[Takashi Yano via Cygwin-patches]

- After commit 095972ce5b1d319915501a7e381802914bed790c, charset
  conversion in mintty is broken if charset is set to other than
  UTF-8. This seems to be caused because mintty does not set locale
  yet at fork() call. This patch changes the timing of set_locale()
  call again to avoid this issue.
---
 winsup/cygwin/fhandler_tty.cc | 10 ++
 winsup/cygwin/spawn.cc| 12 
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 40b79bfbb..6294e2c20 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2852,6 +2852,9 @@ get_langinfo (char *locale_out, char *charset_out)
 void
 fhandler_pty_slave::setup_locale (void)
 {
+  if (get_ttyp ()->term_code_page != 0)
+return;
+
   char locale[ENCODING_LEN + 1] = "C";
   char charset[ENCODING_LEN + 1] = "ASCII";
   LCID lcid = get_langinfo (locale, charset);
@@ -2983,10 +2986,6 @@ fhandler_pty_slave::fixup_after_fork (HANDLE parent)
   // fork_fixup (parent, inuse, "inuse");
   // fhandler_pty_common::fixup_after_fork (parent);
   report_tty_counts (this, "inherited", "");
-
-  /* Set locale */
-  if (get_ttyp ()->term_code_page == 0)
-setup_locale ();
 }
 
 void
@@ -3024,6 +3023,9 @@ fhandler_pty_slave::fixup_after_exec ()
}
 }
 
+  /* Set locale */
+  setup_locale ();
+
   /* Hook Console API */
   if (get_pseudo_console ())
 {
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index e70ceb86d..af177c0f1 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -628,6 +628,18 @@ child_info_spawn::worker (const char *prog_arg, const char 
*const *argv,
}
}
 
+  if (!iscygwin ())
+   {
+ cfd.rewind ();
+ while (cfd.next () >= 0)
+   if (cfd->get_major () == DEV_PTYS_MAJOR)
+ {
+   fhandler_pty_slave *ptys =
+ (fhandler_pty_slave *)(fhandler_base *) cfd;
+   ptys->setup_locale ();
+ }
+   }
+
   /* Set up needed handles for stdio */
   si.dwFlags = STARTF_USESTDHANDLES;
   si.hStdInput = handle ((in__stdin < 0 ? 0 : in__stdin), false,
-- 
2.28.0