* [PATCH] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
@ 2022-05-28 14:20 Takashi Yano
2022-05-28 15:23 ` Ken Brown
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2022-05-28 14:20 UTC (permalink / raw)
To: cygwin-patches
- 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
---
winsup/cygwin/cygheap.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 01b49468e..1a817b743 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,
--
2.36.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
2022-05-28 14:20 [PATCH] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory Takashi Yano
@ 2022-05-28 15:23 ` Ken Brown
0 siblings, 0 replies; 2+ messages in thread
From: Ken Brown @ 2022-05-28 15:23 UTC (permalink / raw)
To: cygwin-patches
On 5/28/2022 10:20 AM, Takashi Yano wrote:
> - 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
> ---
> winsup/cygwin/cygheap.cc | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
> index 01b49468e..1a817b743 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,
LGTM.
Ken
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-28 15:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-28 14:20 [PATCH] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory Takashi Yano
2022-05-28 15:23 ` Ken Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).