Add msys support

This adds some support for compiling directly with MSYS.  (The native
versions of MSYSTEM like ucrt64, mingw64, and mingw32 are already
supported).  It doesn't work well yet.

Signed-off-by: Corey Minyard <[email protected]>

Author: cminyard

README.rst

@@ -1167,8 +1167,8 @@ think the problem is in the gensio code.
 Building on Windows
 ===================
 
-The gensio library can be built under Windows using mingw64.  The following
-things don't work::
+The gensio library can be built under Windows using mingw64 or ucrt64.
+The following things don't work::
 
 * sctp
 * pam
@@ -1180,6 +1180,16 @@ sound.
 
 The cm108gpio uses native windows interfaces, so udev is not required.
 
+You can compile under msys, which is there primarily to support file
+transfers with gtlssync and gtlssh.  It uses the native Windows
+interfaces MDNS and sound, but those are not well tested.  Outside of
+that, things may or may not work.  In particular, gtlsshd will not
+compile.  You can specify serial ports with //./COM<n>, but there are
+issues.  Python maybe sort of works.  Tests do not run.  For anything
+besides running gtlssh and doing file transfers, you should probably
+use the native version.  These things can be fixed, but they will take
+some work.
+
 The Windows built-in MDNS interfaces are used, so you don't need avahi
 or DNSSD.  You will need to install the pcre library if you want
 regular expressions in it.

c++/swig/pygensio/tests/runtest.in

@@ -55,7 +55,7 @@ fi
 
 if ${PYTHON_MODE}; then
     export PYTHONPATH="${BUILDDIR}/tests:${BUILDDIR}/c++/swig/pygensio:${BUILDDIR}/c++/swig/pygensio/.libs:${SRCDIR}/c++/swig/pygensio/test:${BUILDDIR}/glib/c++/swig/pygensio:${BUILDDIR}/glib/c++/swig/pygensio/.libs:${BUILDDIR}/tcl/c++/swig/pygensio:${BUILDDIR}/tcl/c++/swig/pygensio/.libs:${TEST_BUILDDIR}"
-    if [ ! -z "$MSYSTEM" ]; then
+    if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
 	# PYTHONPATH is separated by ; on windows
         export PYTHONPATH=`echo ${PYTHONPATH} | tr ':' ';'`
     fi
@@ -69,7 +69,7 @@ else
 fi
 
 # We need to put the DLL in PATH for MSYS on Windows
-if [ ! -z "$MSYSTEM" ]; then
+if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
     export PATH="${BUILDDIR}/lib:${BUILDDIR}/lib/.libs:${BUILDDIR}/c++/lib/.libs:${BUILDDIR}/c++/swig/pygensio/.libs:${BUILDDIR}/glib/.libs:${BUILDDIR}/glib/c++/swig/pygensio/.libs:${BUILDDIR}/tcl/.libs:${BUILDDIR}/tcl/c++/swig/pygensio/.libs:$PATH"
 else
     export LD_LIBRARY_PATH=${BUILDDIR}/lib:${BUILDDIR}/lib/.libs:${BUILDDIR}/c++/swig/pygensio/.libs:${BUILDDIR}/glib/.libs:${BUILDDIR}/glib/c++/pygensio/.libs:${BUILDDIR}/tcl/.libs:${BUILDDIR}/tcl/c++/pygensio/.libs:${BUILDDIR}/c++/lib/.libs
@@ -80,7 +80,7 @@ fi
 
 if ${PRINT_MODE}; then
     echo export PYTHONPATH="${PYTHONPATH}"
-    if [ ! -z "$MSYSTEM" ]; then
+    if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
 	echo export PATH=${PATH}
     elif test `uname` != Darwin; then
 	echo export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"

configure.ac

@@ -103,7 +103,21 @@ HAVE_UCRED=0
 
 HAVE_WIN32SOUND=0
 
+DISABLE_GO=no
+
+DISABLE_GTLSSHD=no
+
+# 
 case $target_os in
+	msys)
+		OSH_LIBS="$OSH_LIBS -ldl"
+		uucp_locking_flag=no
+		flock_locking_flag=no
+		PYTHON_UNDEF_FLAG=-no-undefined
+		HAVE_WIN32SOUND=1
+		DISABLE_GO=yes
+		DISABLE_GTLSSHD=yes
+		;;
 	mingw*)
 		OSH_LIBS="$OSH_LIBS -lws2_32 -liphlpapi -lgdi32 -lbcrypt"
 		OSH_LIBS="$OSH_LIBS -lsecur32 -luserenv -lwtsapi32"
@@ -1193,6 +1207,10 @@ if test $trymdns = yes -a ${HAVE_AVAHI} = 0 -a ${HAVE_DNSSD} = 0 \
    if test "$HAVE_WINMDNS" = "1"; then
       mdns=$default_all
       MDNS_LIBS="-ldnsapi"
+      if test $target_os = msys; then
+	  # We are using Windows MDNS on MSYS2
+	  MDNS_LIBS="-liphlpapi $MDNS_LIBS"
+      fi
       HAVE_MDNS=1
    fi
 fi
@@ -2080,7 +2098,7 @@ AC_SUBST(PYTHON_UNDEF_LIBS)
 PYTHON_EXECUTABLE="${PYTHON}"
 AC_SUBST(PYTHON_EXECUTABLE)
 
-if test $available_swig_vernum -ge 40100 -a "${enable_shared}" = yes; then
+if test $available_swig_vernum -ge 40100 -a "${enable_shared}" = yes -a $DISABLE_GO != yes; then
    trygo=yes
 else
    trygo=no
@@ -2152,7 +2170,9 @@ GTLSSYNCMAN=
 GTLSSHDMAN=
 GTLSSH_KEYGENMAN=
 if test $HAVE_OPENSSL -eq 1; then
-   if test $HAVE_PAM -eq 1; then
+   if test $DISABLE_GTLSSHD = yes; then
+      echo "gltsshD disabled"
+   elif test $HAVE_PAM -eq 1; then
       GTLSSHD="gtlsshd\$(EXEEXT)"
       GTLSSHDMAN=gtlsshd.8
    elif test "$version_type" = "windows"; then
@@ -2212,7 +2232,7 @@ AC_SUBST(HAVE_UNIX)
 AC_DEFINE_UNQUOTED([HAVE_UNIX], [$HAVE_UNIX], [Enable unix socket file handling])
 
 GENSIO_PTY_HELPER=
-if test "$version_type" = "windows"; then
+if test "$version_type" = "windows" -a "$target_os" != "msys"; then
    # We have PTY support for windows.
    HAVE_PTY=1
    GENSIO_PTY_HELPER="gensio_pty_helper\$(EXEEXT)"

lib/gensio_cm108gpio.c

@@ -233,12 +233,13 @@ hid_close(int fd)
     close(fd);
 }
 
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(__MSYS__)
 
 #include <windows.h>
 #include <setupapi.h>
 #include <hidsdi.h>
 #include <wchar.h>
+#include <wctype.h>
 
 /* Stolen from hidclass.h. */
 static const GUID my_GUID_DEVINTERFACE_HID =

lib/gensio_pty.c

@@ -7,7 +7,7 @@
 
 /* This code handles running a child process using a pty. */
 
-#ifdef linux
+#if defined(linux) || defined(__MSYS__)
 #define _GNU_SOURCE /* Get ptsname_r(). */
 #endif
 

lib/mdns.c

@@ -18,6 +18,11 @@
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <unistd.h>
+#ifdef __MSYS__
+typedef struct in6_addr IN6_ADDR;
+#include <iphlpapi.h>
+#endif
 #endif
 #include <gensio/gensio.h>
 #include <gensio/gensio_list.h>

lib/net_stdsock.c

@@ -1493,15 +1493,15 @@ gensio_stdsock_mcast_add(struct gensio_iod *iod,
 	case AF_INET:
 	    {
 		struct sockaddr_in *a = (struct sockaddr_in *) ai->ai_addr;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__MSYS__)
 		struct ip_mreq m;
 #else
 		struct ip_mreqn m;
 #endif
 
 		memset(&m, 0, sizeof(m));
 		m.imr_multiaddr = a->sin_addr;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__MSYS__)
 		m.imr_address.s_addr = INADDR_ANY;
 		m.imr_ifindex = iface;
 #endif
@@ -1564,15 +1564,15 @@ gensio_stdsock_mcast_del(struct gensio_iod *iod,
 	case AF_INET:
 	    {
 		struct sockaddr_in *a = (struct sockaddr_in *) ai->ai_addr;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__MSYS__)
 		struct ip_mreq m;
 #else
 		struct ip_mreqn m;
 #endif
 
 		memset(&m, 0, sizeof(m));
 		m.imr_multiaddr = a->sin_addr;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__MSYS__)
 		m.imr_address.s_addr = INADDR_ANY;
 		m.imr_ifindex = iface;
 #endif
@@ -2206,8 +2206,10 @@ gensio_setup_listen_socket(struct gensio_os_funcs *o,
 #endif
     }else if (family == AF_UNIX)
 	protocol = GENSIO_NET_PROTOCOL_UNIX;
+#ifdef IPPROTO_SCTP
     else if (sockproto == IPPROTO_SCTP)
 	protocol = GENSIO_NET_PROTOCOL_SCTP;
+#endif
     else if (sockproto == 0 && socktype == SOCK_DGRAM)
 	protocol = GENSIO_NET_PROTOCOL_UDP;
     else if (sockproto == 0 && socktype == SOCK_STREAM)

lib/os_osops.c

@@ -5,7 +5,7 @@
  *  SPDX-License-Identifier: LGPL-2.1-only
  */
 
-#ifdef linux
+#if defined(linux) || defined(__MSYS__)
 #define _XOPEN_SOURCE 600 /* Get posix_openpt() and friends. */
 #define _GNU_SOURCE /* Get ptsname_r(). */
 #endif
@@ -3302,9 +3302,11 @@ gensio_unix_get_bufcount(struct gensio_os_funcs *o,
 #endif
 	    break;
 
+#ifdef TIOCOUTQ
 	case GENSIO_OUT_BUF:
 	    rv = ioctl(fd, TIOCOUTQ, &count);
 	    break;
+#endif
 
 	default:
 	    return GE_NOTSUP;

lib/os_unix.c

@@ -106,9 +106,13 @@ init_mutex(unsigned int flags, lock_type *mutex)
 
     pthread_mutexattr_init(&mattr);
     if (flags & GENSIO_OS_FUNCS_FLAG_PRIO_INHERIT) {
+#ifdef PTHREAD_PRIO_INHERIT
 	int rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT);
 	if (rv)
 	    return rv;
+#else
+	return GE_NOTSUP;
+#endif
     }
     pthread_mutex_init(mutex, &mattr);
     return 0;

tests/runtest.in

@@ -55,7 +55,7 @@ fi
 
 if ${PYTHON_MODE}; then
     export PYTHONPATH="${BUILDDIR}/swig/python:${BUILDDIR}/swig/python/.libs:${BUILDDIR}/glib/swig/python:${BUILDDIR}/glib/swig/python/.libs:${BUILDDIR}/tcl/swig/python:${BUILDDIR}/tcl/swig/python/.libs:${TEST_BUILDDIR}"
-    if [ ! -z "$MSYSTEM" ]; then
+    if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
 	# PYTHONPATH is separated by ; on windows
         export PYTHONPATH=`echo ${PYTHONPATH} | tr ':' ';'`
     fi
@@ -69,7 +69,7 @@ else
 fi
 
 # We need to put the DLL in PATH for MSYS on Windows
-if [ ! -z "$MSYSTEM" ]; then
+if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
     export PATH="${BUILDDIR}/lib:${BUILDDIR}/lib/.libs:${BUILDDIR}/glib/.libs:${BUILDDIR}/tcl/.libs:${BUILDDIR}/swig/python/.libs:$PATH"
 else
     export LD_LIBRARY_PATH=${BUILDDIR}/lib:${BUILDDIR}/lib/.libs:${BUILDDIR}/glib/.libs:${BUILDDIR}/tcl/.libs:${BUILDDIR}/swig/python/.libs
@@ -80,7 +80,7 @@ fi
 
 if ${PRINT_MODE}; then
     echo export PYTHONPATH="${PYTHONPATH}"
-    if [ ! -z "$MSYSTEM" ]; then
+    if [ ! -z "$MSYSTEM" -a "$MSYSTEM" != "MSYS" ]; then
 	echo export PATH="${PATH}"
     else
 	echo export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"

tools/gtlssh.c

@@ -47,6 +47,18 @@
 
 unsigned int debug;
 
+/*
+ * Permissions are not easily fixable on msys, so checking for private
+ * doesn't work ATM.  It always reads 755 for directories and 644 for
+ * files.  You can fix it with icacls, but it still won't display
+ * properly.
+ */
+#ifdef __MSYS__
+static bool do_check_private = false;
+#else
+static bool do_check_private = true;
+#endif
+
 struct gdata {
     struct gensio_os_funcs *o;
     struct gensio_waiter *waiter;
@@ -741,7 +753,7 @@ lookup_certinfo(struct gensio_os_funcs *o,
     if (err)
 	goto out_err;
 
-    err = checkout_file(glogger, NULL, keyname, false, true);
+    err = checkout_file(glogger, NULL, keyname, false, do_check_private);
     if (err)
 	goto out_err;
 
@@ -2064,7 +2076,7 @@ main(int argc, char *argv[])
 	    return 1;
     }
 
-    err = checkout_file(glogger, NULL, tlssh_dir, true, true);
+    err = checkout_file(glogger, NULL, tlssh_dir, true, do_check_private);
     if (err)
 	return 1;