3.5.0

0001-notify-size-change-inband.patch

@@ -1,18 +1,7 @@
-Date: Tue, 15 Sep 2020 06:15:34 +0200
-Subject: [PATCH] notify window size change via escaped inband information
- (Biswa96/wslbridge2#21, mintty/wsltty#220)
-Co-authored-by: Thomas Wolff <towo@towo.net>
-
----
- src/wslbridge2-backend.cpp | 87 +++++++++++++++++++++++++++++++++++++-
- src/wslbridge2.cpp         | 83 ++++++++++++++++++++++++++++++------
- 2 files changed, 155 insertions(+), 15 deletions(-)
-
-diff --git a/src/wslbridge2-backend.cpp b/src/wslbridge2-backend.cpp
-index b50ee9c..ad429ae 100644
---- a/src/wslbridge2-backend.cpp
-+++ b/src/wslbridge2-backend.cpp
-@@ -24,6 +24,7 @@
+diff -rup old/src/wslbridge2-backend.cpp new/src/wslbridge2-backend.cpp
+--- old/src/wslbridge2-backend.cpp	2020-10-18 15:03:06.000000000 +0000
++++ new/src/wslbridge2-backend.cpp	2021-03-18 18:31:35.684184400 +0000
+@@ -21,6 +21,7 @@
  #include <termios.h>
  #include <unistd.h>
  #include <wordexp.h>
@@ -20,7 +9,7 @@ index b50ee9c..ad429ae 100644
  
  #include <string>
  #include <vector>
-@@ -315,6 +316,9 @@ int main(int argc, char *argv[])
+@@ -321,6 +322,9 @@ int main(int argc, char *argv[])
          /* Use dupped master fd to read OR write */
          const int mfd_dp = dup(mfd);
          assert(mfd_dp > 0);
@@ -28,9 +17,9 @@ index b50ee9c..ad429ae 100644
 +        FILE * debug = fdopen(mfd_dp, "w"); // for fprintf
 +#endif
  
-         sigset_t set;
-         sigemptyset(&set);
-@@ -333,6 +337,7 @@ int main(int argc, char *argv[])
+         struct pollfd fds[] = {
+                 { ioSockets.inputSock, POLLIN, 0 },
+@@ -330,6 +334,7 @@ int main(int argc, char *argv[])
  
          ssize_t readRet = 0, writeRet = 0;
          char data[1024]; /* Buffer to hold raw data from pty */
@@ -38,7 +27,7 @@ index b50ee9c..ad429ae 100644
  
          do
          {
-@@ -343,8 +348,86 @@ int main(int argc, char *argv[])
+@@ -340,8 +345,86 @@ int main(int argc, char *argv[])
              if (fds[0].revents & POLLIN)
              {
                  readRet = recv(ioSockets.inputSock, data, sizeof data, 0);
@@ -127,11 +116,10 @@ index b50ee9c..ad429ae 100644
              }
  
              /* Resize window when buffer received in control socket */
-diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
-index 75ccb1b..e9fbbf7 100644
---- a/src/wslbridge2.cpp
-+++ b/src/wslbridge2.cpp
-@@ -56,32 +56,85 @@ union IoSockets
+diff -rup old/src/wslbridge2.cpp new/src/wslbridge2.cpp
+--- old/src/wslbridge2.cpp	2020-10-18 15:03:06.000000000 +0000
++++ new/src/wslbridge2.cpp	2021-02-26 17:45:28.437040700 +0000
+@@ -57,32 +57,85 @@ union IoSockets
  /* global variable */
  static union IoSockets g_ioSockets = { 0, 0, 0 };
  
@@ -223,8 +211,16 @@ index 75ccb1b..e9fbbf7 100644
                  break;
          }
      }
-@@ -537,13 +590,6 @@ int main(int argc, char *argv[])
-         closesocket(controlSocket);
+@@ -164,6 +217,7 @@ int main(int argc, char *argv[])
+     if (GetWindowsBuild() < 17763)
+         fatal("Windows 10 version is older than minimal requirement.\n");
+ 
++    setlocale(LC_ALL, "");
+ #ifdef __CYGWIN__
+     cygwin_internal(CW_SYNC_WINENV);
+ #endif
+@@ -529,13 +583,6 @@ int main(int argc, char *argv[])
+         g_ioSockets.controlSock = AcceptLocSock(controlSocket);
      }
  
 -    /* Create thread to send window size through control socket */
@@ -237,7 +233,7 @@ index 75ccb1b..e9fbbf7 100644
      /* Create thread to send input buffer to input socket */
      pthread_t tidInput;
      ret = pthread_create(&tidInput, nullptr, send_buffer, nullptr);
-@@ -556,6 +602,17 @@ int main(int argc, char *argv[])
+@@ -548,6 +595,17 @@ int main(int argc, char *argv[])
  
      termState.enterRawMode();
  

README.md

@@ -51,7 +51,7 @@ Note this has to be done within a Cygwin environment. A minimal Cygwin
 environment for this purpose would be installed with the 
 [Cygwin installer](https://cygwin.com/setup-x86_64.exe) 
 from [cygwin.com](https://cygwin.com/), 
-with additional packages `make`, `gcc-g++ 9.3.0`, `unzip`, `zoo`.
+with additional packages `make`, `gcc-g++`, `unzip`, `zoo`, `patch`, (`lcab`).
 
 #### Installation to non-default locations ####
 

VERSION

@@ -1 +1 @@
-3.4.4
+3.5.0

config-distros.sh

@@ -291,6 +291,15 @@ config () {
   echoc "- root $root"
   wdir=%USERPROFILE%
 
+  case "$name" in
+  docker*)	echo skipping docker system
+  		return;;
+  esac
+  case "$root" in
+  *\\Docker*)	echo skipping docker system
+  		return;;
+  esac
+
   if $ok && ! $remove && [ -n "$distro" ]
   then	# fix #163: backend missing +x with certain mount options
 	echo Setting +x wslbridge2 backends for distro "'$distro'"

makefile

@@ -10,16 +10,16 @@
 
 
 # wsltty release
-ver=3.4.4
+ver=3.5.0
 
 # wsltty appx release - must have 4 parts!
-verx=3.4.4.0
+verx=3.5.0.0
 
 
 ##############################
 # mintty release version
 
-minttyver=3.4.4
+minttyver=3.5.0
 
 ##############################
 
@@ -278,7 +278,7 @@ cop:	copcab
 
 installer:	cop
 	# prepare build of installer
-	rm -f rel/wsltty-$(ver)-install-$(arch).exe
+	rm -f rel/$(CAB)-install.exe
 	sed -e "s,%version%,$(ver)," -e "s,%arch%,$(arch)," makewinx.cfg > rel/wsltty.SED
 	# build installer
 	cd rel; iexpress /n wsltty.SED

makewinx.cfg

@@ -26,7 +26,7 @@ SourceFiles=SourceFiles
 InstallPrompt=Install Mintty terminal for WSL (Windows Subsystem for Linux)?
 DisplayLicense=
 FinishMessage=Mintty for WSL installed - for documentation and configuration see https://github.com/mintty/wsltty
-TargetName=wsltty-%version%-install-%arch%.exe
+TargetName=wsltty-%version%-%arch%-install.exe
 FriendlyName=wsltty
 AppLaunched=cmd.exe /c install.bat
 PostInstallCmd=<None>