#98 - improved UNC and extended prefix support

Author: adamyg

mcsrc/lib/strutil/strescape.c

@@ -129,6 +129,16 @@ str_unescape (const char *src, gsize src_len, const char *unescaped_chars,
             continue;
         }
 
+#if defined(WIN32) //WIN32, path/UNC
+        if (curr_index <= 1 && src[curr_index + 1] == '\\') // retain leading "\\ .."
+        {
+            g_string_append_c (ret, '\\');
+            g_string_append_c (ret, '\\');
+            ++curr_index;
+            continue;
+        }
+#endif
+
         curr_index++;
 
         if (unescaped_chars == ESCAPE_SHELL_CHARS && src[curr_index] == '$')

mcsrc/lib/vfs/path.c

@@ -463,7 +463,19 @@ vfs_path_from_str_uri_parser (char *path)
     if (path == NULL)
         return vfs_path_new (FALSE);
 
+#if defined(WIN32) //WIN32, drive/path
+    if (path[0] == '"' || path[0] == '\'') {
+        size_t plen = strlen(path);
+        if (plen > 1 && path[0] == path[plen - 1]) { // quoted, remove
+            plen -= 2;
+            memmove(path, path + 1, plen);
+            path[plen] = 0;
+        }
+    }
+    path_is_absolute = IS_PATH_SEP(*path) || (isalpha((unsigned char)path[0]) && path[1] == ':');
+#else
     path_is_absolute = IS_PATH_SEP (*path);
+#endif
 #ifdef HAVE_CHARSET
     path_is_absolute = path_is_absolute || g_str_has_prefix (path, VFS_ENCODING_PREFIX);
 #endif

mcsrc/lib/widget/input_complete.c

@@ -55,7 +55,7 @@
 /*** global variables ****************************************************************************/
 
 /* Linux declares environ in <unistd.h>, so don't repeat it here. */
-#if !defined(_MSC_VER) && !defined(__WATCOMC__) //WIN32/c11
+#if !defined(_MSC_VER) && !defined(__WATCOMC__) && !defined(__MINGW32__) //WIN32/c11
 #if !HAVE_DECL_ENVIRON
 extern char **environ;
 #endif

mcwin32/ChangeLog.txt

@@ -1,4 +1,4 @@
-Thu Feb 20 12:11:28 2025 adamy
+Fri Mar  7 11:26:56 2025 adamy
 
 	* build-231
 
@@ -16,6 +16,7 @@ Thu Feb 20 12:11:28 2025 adamy
 		o glib 2.54.3 (#102)
 		o zlib-1.3.1 (#102)
 		o mbedtls-3.6.2 (#100)
+		o improved UNC and extended prefix support, plus stat optmisations (#98)
 		o libssh2-1.11.1 (#95)
 		o enhanced utf8 support, directory plus username; non-ascii user name support (#97)
 		o EXDEV, cross-device link on rename failure; allowing alt move logic (#85)

mcwin32/libw32/Makefile.in

@@ -1,17 +1,16 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.27 2024/02/03 17:22:14 cvsuser Exp $
+# $Id: Makefile.in,v 1.28 2025/03/06 16:59:45 cvsuser Exp $
 # libwin32 makefile.
 #
 #
-# Copyright (c) 2007, 2012 - 2024 Adam Young.
+# Copyright (c) 2007, 2012 - 2025 Adam Young.
 # All rights reserved.
 #
 # This file is part of the Midnight Commander.
 #
 # 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.
+# published by the Free Software Foundation, version 3.
 #
 # The Midnight Commander is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -124,18 +123,20 @@ VERSIONSPEC=	$(subst .,:,$(VERSION))
 
 CSOURCES=\
 	w32_access.c \
+	w32_basename.c \
 	w32_check.c \
 	w32_child.c \
 	w32_chmod.c \
 	w32_chown.c \
 	w32_close.c \
 	w32_dir.c \
 	w32_dirent.c \
-	w32_wdirent.c \
-	w32_dlfcn.c \
 	w32_direntunc.c \
+	w32_dirname.c \
+	w32_dlfcn.c \
 	w32_domainname.c \
 	w32_err.c \
+	w32_wdirent.c \
 	w32_errno.c \
 	w32_flock.c \
 	w32_fcntl.c \

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.9 2025/02/16 12:04:04 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_alloca_h,"$Id: alloca.h,v 1.10 2025/03/06 16:59:45 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -15,7 +15,6 @@ __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/arpa/ftp.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_ARPA_FTP_H_INCLUDED
 #define LIBW32_ARPA_FTP_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_arpa_ftp_h,"$Id: ftp.h,v 1.6 2024/03/14 18:54:32 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_arpa_ftp_h,"$Id: ftp.h,v 1.7 2025/03/06 16:59:47 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -13,8 +13,7 @@ __CPRAGMA_ONCE
  *
  * 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.
+ * published by the Free Software Foundation, version 3.
  *
  * The Midnight Commander is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

mcwin32/libw32/arpa/inet.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_ARPA_INET_H_INCLUDED
 #define LIBW32_ARPA_INET_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_arpa_inet_h,"$Id: inet.h,v 1.5 2024/03/14 18:54:32 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_arpa_inet_h,"$Id: inet.h,v 1.6 2025/03/06 16:59:47 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -13,8 +13,7 @@ __CPRAGMA_ONCE
  *
  * 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.
+ * published by the Free Software Foundation, version 3.
  *
  * The Midnight Commander is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

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.19 2025/02/13 17:55:23 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_dirent_h,"$Id: dirent.h,v 1.20 2025/03/06 16:59:45 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -16,7 +16,6 @@ __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/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.6 2025/02/13 17:55:24 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_dlfcn_h,"$Id: dlfcn.h,v 1.7 2025/03/06 16:59:45 cvsuser Exp $")
 __CPRAGMA_ONCE
 
 /* -*- mode: c; indent-width: 4; -*- */
@@ -16,7 +16,6 @@ __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.