Merge pull request #23 from adamyg/topic/build-226

Topic/build 226

mcsrc/src/vfs/fish/fish.c

@@ -425,12 +425,14 @@ static void
 fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[])
 {
 #if defined(WIN32) //WIN32, fish
+    fish_super_t *fish_super = FISH_SUPER (super);
     char cmd[1024], t_path[MAX_PATH] = {0};
     GError *error = NULL;
     int fds[2] = {-1, -1};
     int syslen, len;
 
     if (0 == strcmp(path, "ssh")) { //FIXME
+#if (1)
         // OpenSSH
         if (0 != (syslen = GetWindowsDirectoryA(t_path, sizeof(t_path)))) {
             snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\System32\\OpenSSH\\ssh.exe"); //32-bit
@@ -444,18 +446,22 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[])
             }
         }
 
-        // WinRSH
+        // WinXSH
         if (path != t_path && 0 != (syslen = w32_getsysdirA(SYSDIR_PROGRAM_FILES, t_path, sizeof(t_path))))  {
-            snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinRSH\\ssh.exe");
+            snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\slogin.exe");
             if (0 == access(t_path, 0)) {
                 path = t_path;
             }
         }
+#else
+        snprintf (t_path, sizeof(t_path), "/devl/winrsh/bin.owc19/debug/slogin.exe");
+        path = t_path;
+#endif
 
     } else if (0 == strcmp(path, "rsh")) {
-        // WinRSH
+        // WinXSH
         if (0 != (syslen = w32_getsysdirA(SYSDIR_PROGRAM_FILES, t_path, sizeof(t_path))))  {
-            snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinRSH\\rsh.exe");
+            snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\rsh.exe");
             if (0 == access(t_path, 0)) {
                 path = t_path;
             }
@@ -480,8 +486,8 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[])
         g_error_free (error);
     }
 
-    FISH_SUPER(super)->sockr = fds[0];
-    FISH_SUPER(super)->sockw = fds[1];
+    fish_super->sockr = fds[0];
+    fish_super->sockw = fds[1];
 
 #else
     int fileset1[2], fileset2[2];

mcwin32/ChangeLog.txt

@@ -1,8 +1,11 @@
-Pending build-226
+Mon Mar 21 10:47:17 2022 adamy
 
-Tue Mar 15 14:47:05 2022 adamy
+	* build-226
 
-	* #21 - FISH enabled, OpenSSH required.
+	* #21 - FISH enabled
+
+		o ssh - OpenSSH required (https://github.com/powershell/Win32-OpenSSH) or WinXRSH (below).
+		o rsh - WinRXH (https://github.com/adamyg/winxsh).
 
 Fri Mar 11 21:41:28 2022 adamy
 

mcwin32/Makefile.in

@@ -757,7 +757,7 @@ gettext:			$(MSGDIRS) $(MSGOBJS)
 CONFIGURATION_WIN32=\
 	$(addprefix $(D_ETC)/,$(CFG_WIN32_ETC)) \
 	$(addprefix $(D_PLUGIN)/,$(CFG_WIN32_PLUGIN)) \
-	$(addprefix $(WIN32_PLUGIN_SRC)/extfs.d/,$(CFG_WIN32_PLUGIN_EXTFS_D)) \
+	$(addprefix $(D_PLUGIN)/extfs.d/,$(CFG_WIN32_PLUGIN_EXTFS_D)) \
 	$(addprefix $(D_SHARE)/skins/,$(CFG_WIN32_SKINS))
 
 .PHONY:				configuration-win32

mcwin32/libmbedtls/Makefile.in

@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.7 2022/03/05 08:24:49 cvsuser Exp $
+# $Id: Makefile.in,v 1.8 2022/03/21 02:45:11 cvsuser Exp $
 # libmbedtls makefile.
 #
 #
@@ -85,7 +85,7 @@ else
 CFLAGS+=	$(CDEBUG) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)
 LDFLAGS=	$(LDDEBUG) @LDFLAGS@
 endif
-LDLIBS=		-L$(D_LIB) $(D_LIB)/$(LP)regex$(A) @LIBS@ @LIBM@ @EXTRALIBS@
+LDLIBS=		-L$(D_LIB) @LIBS@ @LIBM@ @EXTRALIBS@
 
 ARFLAGS=	rcv
 RMFLAGS=	-f

mcwin32/libw32/LICENSE.txt

@@ -1,27 +1,26 @@
 
-Windows minimal posix implementation for Midnight Commander.
+Windows minimal POSIX implementation.
 
 This library fills a few holes which are not generally provided by
 run-time libraries of native WIN32 compiler chains.
 
-Copyright (c) 2007, 2012-2021, Adam Young.
+Copyright (c) 2007, 2012-2022, Adam Young.
+All rights reserved.
 
     ------------------------------------------------------------
 
-This file is part of the Midnight Commander.
+Redistributions of source code must retain the above copyright
+notice, and must be distributed with the project license document.
 
-The Midnight Commander is free software: you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the License,
-or (at your option) any later version.
+Redistributions in binary form must reproduce the above copyright
+notice, and must include the license document above in
+the documentation and/or other materials provided with the
+distribution.
 
-The Midnight Commander is distributed in the hope that it will be useful,
+The applications are distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+License for more details.
 
     ------------------------------------------------------------
 

mcwin32/libw32/alloca.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_ALLOCA_H_INCLUDED
 #define LIBW32_ALLOCA_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_alloca_h,"$Id: alloca.h,v 1.5 2022/02/17 16:04:58 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_alloca_h,"$Id: alloca.h,v 1.6 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -12,18 +12,23 @@ __CPRAGMA_ONCE
  *
  * This file is part of the Midnight Commander.
  *
- * The Midnight Commander is free software: you can redistribute it
+ * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
+ * published by the Free Software Foundation, version 3.
  * or (at your option) any later version.
  *
- * The Midnight Commander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Redistributions of source code must retain the above copyright
+ * notice, and must be distributed with the license document above.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, and must include the license document above in
+ * the documentation and/or other materials provided with the
+ * distribution.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This project is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license for more details.
  * ==end==
  */
 

mcwin32/libw32/dirent.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_DIRENT_H_INCLUDED
 #define LIBW32_DIRENT_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_dirent_h,"$Id: dirent.h,v 1.13 2022/02/17 16:04:58 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_dirent_h,"$Id: dirent.h,v 1.14 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -16,6 +16,7 @@ __CPRAGMA_ONCE
  * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 3.
+ * or (at your option) any later version.
  *
  * Redistributions of source code must retain the above copyright
  * notice, and must be distributed with the license document above.
@@ -237,4 +238,3 @@ LIBW32_API int          getdirentries __P((int, char *, int, long *));
 __END_DECLS
 
 #endif /*LIBW32_DIRENT_H_INCLUDED*/
-

mcwin32/libw32/dlfcn.h

@@ -1,7 +1,7 @@
 #ifndef GR_DLFCN_H_INCLUDED
 #define GR_DLFCN_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_dlfcn_h,"$Id: dlfcn.h,v 1.2 2021/11/30 13:06:19 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_dlfcn_h,"$Id: dlfcn.h,v 1.3 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -13,18 +13,23 @@ __CPRAGMA_ONCE
  *
  * This file is part of the Midnight Commander.
  *
- * The Midnight Commander is free software: you can redistribute it
+ * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
+ * published by the Free Software Foundation, version 3.
  * or (at your option) any later version.
  *
- * The Midnight Commander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Redistributions of source code must retain the above copyright
+ * notice, and must be distributed with the license document above.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, and must include the license document above in
+ * the documentation and/or other materials provided with the
+ * distribution.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This project is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license for more details.
  * ==end==
  */
 

mcwin32/libw32/edidentifier.h

@@ -2,7 +2,7 @@
 #define LIBW32_EDIDENTIFIER_H_INCLUDED
 
 /* -*- mode: c; indent-width: 4; -*- */
-/*  $Id: edidentifier.h,v 1.4 2022/02/17 16:04:58 cvsuser Exp $
+/*  $Id: edidentifier.h,v 1.5 2022/03/16 13:46:58 cvsuser Exp $
  *  Compiler specific object identify functionality.
  *
  *      __CIDENT(description)
@@ -14,18 +14,23 @@
  *
  * This file is part of the Midnight Commander.
  *
- * The Midnight Commander is free software: you can redistribute it
+ * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
+ * published by the Free Software Foundation, version 3.
  * or (at your option) any later version.
  *
- * The Midnight Commander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Redistributions of source code must retain the above copyright
+ * notice, and must be distributed with the license document above.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, and must include the license document above in
+ * the documentation and/or other materials provided with the
+ * distribution.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This project is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license for more details.
  * ==end==
  */
 

mcwin32/libw32/err.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_ERR_H_INCLUDED
 #define LIBW32_ERR_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_err_h,"$Id: err.h,v 1.2 2021/04/13 15:49:34 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_err_h,"$Id: err.h,v 1.3 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -13,18 +13,23 @@ __CPRAGMA_ONCE
  *
  * This file is part of the Midnight Commander.
  *
- * The Midnight Commander is free software: you can redistribute it
+ * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
+ * published by the Free Software Foundation, version 3.
  * or (at your option) any later version.
  *
- * The Midnight Commander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Redistributions of source code must retain the above copyright
+ * notice, and must be distributed with the license document above.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, and must include the license document above in
+ * the documentation and/or other materials provided with the
+ * distribution.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This project is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license for more details.
  * ==end==
  */
 
@@ -50,4 +55,4 @@ LIBW32_API void         verrx(int eval, const char *fmt, va_list ap);
 
 __END_DECLS
 
-#endif /*WIN32_ERR_H_INCLUDED*/
+#endif /*LIBW32_ERR_H_INCLUDED*/

mcwin32/libw32/getopt.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_GETOPT_H_INCLUDED
 #define LIBW32_GETOPT_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_getopt_h,"$Id: getopt.h,v 1.7 2021/04/13 15:49:34 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_getopt_h,"$Id: getopt.h,v 1.8 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 /* -*- mode: c; indent-width: 4; -*- */
 /*
@@ -15,6 +15,7 @@ __CPRAGMA_ONCE
  * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 3.
+ * or (at your option) any later version.
  *
  * Redistributions of source code must retain the above copyright
  * notice, and must be distributed with the license document above.
@@ -66,4 +67,3 @@ LIBW32_API int          getopt_long2(int argvc, char * const *argv, const char *
 __END_DECLS
 
 #endif /*LIBW32_GETOPT_H_INCLUDED*/
-

mcwin32/libw32/grp.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_GRP_H_INCLUDED
 #define LIBW32_GRP_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_grp_h,"$Id: grp.h,v 1.8 2022/02/17 16:04:58 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_grp_h,"$Id: grp.h,v 1.9 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -16,6 +16,7 @@ __CPRAGMA_ONCE
  * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 3.
+ * or (at your option) any later version.
  *
  * Redistributions of source code must retain the above copyright
  * notice, and must be distributed with the license document above.

mcwin32/libw32/langinfo.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_LANGINFO_H_INCLUDED
 #define LIBW32_LANGINFO_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_langinfo_h,"$Id: langinfo.h,v 1.5 2022/02/17 16:04:58 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_langinfo_h,"$Id: langinfo.h,v 1.6 2022/03/16 13:46:58 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -12,11 +12,10 @@ __CPRAGMA_ONCE
  *
  * This file is part of the Midnight Commander.
  *
- * This file is part of the Midnight Commander.
- *
  * The applications are free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 3.
+ * or (at your option) any later version.
  *
  * Redistributions of source code must retain the above copyright
  * notice, and must be distributed with the license document above.