From 26e603454f5d7fc91027497597375370afd2743f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 2 Jul 2012 14:14:01 +0000 Subject: * dll_init.cc (dll_list::alloc): Take long UNC paths into account. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/dll_init.cc | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 77e54f78b..a045291fa 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2012-07-02 Corinna Vinschen + + * dll_init.cc (dll_list::alloc): Take long UNC paths into account. + 2012-07-01 Christopher Faylor * Makefile.in: Add some more optimization flags for cygwait, malloc and diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index 3b358d5a0..420f0d8f2 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -180,7 +180,14 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type) GetModuleFileNameW (h, buf, sizeof (buf)); PWCHAR name = buf; if (!wcsncmp (name, L"\\\\?\\", 4)) - name += 4; + { + name += 4; + if (!wcsncmp (name, L"UNC\\", 4)) + { + name += 2; + *name = L'\\'; + } + } DWORD namelen = wcslen (name); PWCHAR modname = wcsrchr (name, L'\\') + 1; -- cgit v1.2.3