X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finit.c;h=4d28a2eb1fc87739c34521bdacb76f768473c143;hb=9001c06d1e15c9e0325d6036a0bb38fb1460239d;hp=590dfb4227bc3140075f45630ac2ff0def46cad7;hpb=a7a7aaeaa9feca5377a0da891d2d444db20cdb7d;p=pciutils.git

diff --git a/lib/init.c b/lib/init.c
index 590dfb4..4d28a2e 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -13,6 +13,10 @@
 
 #include "internal.h"
 
+#ifdef PCI_OS_DJGPP
+#include <crt0.h> /* for __dos_argv0 */
+#endif
+
 #ifdef PCI_OS_WINDOWS
 
 #include <windows.h>
@@ -262,7 +266,7 @@ pci_get_method_name(int index)
     return pci_methods[index]->name;
 }
 
-#ifdef PCI_OS_WINDOWS
+#if defined(PCI_OS_WINDOWS) || defined(PCI_OS_DJGPP)
 
 static void
 pci_init_name_list_path(struct pci_access *a)
@@ -274,7 +278,7 @@ pci_init_name_list_path(struct pci_access *a)
       char *path, *sep;
       size_t len;
 
-#if defined(_WIN32) || defined(_WINDLL) || defined(_WINDOWS)
+#if defined(PCI_OS_WINDOWS) && (defined(_WIN32) || defined(_WINDLL) || defined(_WINDOWS))
 
       HMODULE module;
       size_t size;
@@ -296,11 +300,11 @@ pci_init_name_list_path(struct pci_access *a)
        * buffer is too small and does not signal any error. In this case retry
        * again with larger buffer.
        */
-      size = 256; /* initial buffer size (more than sizeof(PCI_IDS)) */
+      size = 256; /* initial buffer size (more than sizeof(PCI_IDS)-4) */
 retry:
       path = pci_malloc(a, size);
-      len = GetModuleFileName(module, path, size-sizeof(PCI_IDS));
-      if (len >= size-sizeof(PCI_IDS))
+      len = GetModuleFileName(module, path, size-sizeof(PCI_IDS)-4); /* 4 for "\\\\?\\" */
+      if (len >= size-sizeof(PCI_IDS)-4)
         {
           free(path);
           size *= 2;
@@ -309,11 +313,55 @@ retry:
       else if (len == 0)
         path[0] = '\0';
 
-#else
+      /*
+       * GetModuleFileName() has bugs. On Windows 10 it prepends current drive
+       * letter if path is just pure NT namespace (with "\\??\\" prefix). Such
+       * extra drive letter makes path fully invalid and unusable. So remove
+       * extra drive letter to make path valid again.
+       * Reproduce: CreateProcessW("\\??\\C:\\lspci.exe", ...)
+       */
+      if (((path[0] >= 'a' && path[0] <= 'z') ||
+           (path[0] >= 'A' && path[0] <= 'Z')) &&
+          strncmp(path+1, ":\\??\\", 5) == 0)
+        {
+          memmove(path, path+2, len-2);
+          len -= 2;
+          path[len] = '\0';
+        }
+
+      /*
+       * GetModuleFileName() has bugs. On Windows 10 it does not add "\\\\?\\"
+       * prefix when path is in native NT UNC namespace. Such path is treated by
+       * WinAPI/DOS functions as standard DOS path relative to the current
+       * directory, hence something completely different. So prepend missing
+       * "\\\\?\\" prefix to make path valid again.
+       * Reproduce: CreateProcessW("\\??\\UNC\\10.0.2.4\\qemu\\lspci.exe", ...)
+       *
+       * If path starts with DOS drive letter and with appended PCI_IDS is
+       * longer than 260 bytes and is without "\\\\?\\" prefix then append it.
+       * This prefix is required for paths and file names with DOS drive letter
+       * longer than 260 bytes.
+       */
+      if (strncmp(path, "\\UNC\\", 5) == 0 ||
+          strncmp(path, "UNC\\", 4) == 0 ||
+          (((path[0] >= 'a' && path[0] <= 'z') || (path[0] >= 'A' && path[0] <= 'Z')) &&
+           len + sizeof(PCI_IDS) >= 260))
+        {
+          memmove(path+4, path, len);
+          memcpy(path, "\\\\?\\", 4);
+          len += 4;
+          path[len] = '\0';
+        }
+
+#elif defined(PCI_OS_DJGPP) || defined(PCI_OS_WINDOWS)
 
       const char *exe_path;
 
+#ifdef PCI_OS_DJGPP
+      exe_path = __dos_argv0;
+#else
       exe_path = _pgmptr;
+#endif
 
       len = strlen(exe_path);
       path = pci_malloc(a, len+sizeof(PCI_IDS));