diff options
author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-05-27 15:54:36 +0300 |
---|---|---|
committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-05-28 17:16:21 +0300 |
commit | 871ca7ba64694e2a3c62d144e2d760bab3dd4a64 (patch) | |
tree | b87977fde30a72fbed98387fc9dd558e5754e0d6 /winsup | |
parent | e93bb6f9852a9dbfe21bd0ffbea1751a5d9cfd60 (diff) |
Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
- After the commit 6d898f43, cygwin fails to start if cygwin1.dll
is placed in the root directory. This patch fixes the issue.
Addresses: https://cygwin.com/pipermail/cygwin/2022-May/251548.html
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/cygwin/cygheap.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index 1be7f0c32..b72bc5a08 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -183,6 +183,11 @@ init_cygheap::init_installation_root () if (p) p = wcschr (p + 1, L'\\'); /* Skip share name */ } + else /* Long path prefix followed by drive letter path */ + { + len = 4; + p += 4; + } } installation_root_buf[1] = L'?'; RtlInitEmptyUnicodeString (&installation_key, installation_key_buf, |