public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_3-branch] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
@ 2022-05-28 15:42 Takashi Yano
0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2022-05-28 15:42 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=dda2f89eb4eb74215085084e1f3ae8d4ad850d6d
commit dda2f89eb4eb74215085084e1f3ae8d4ad850d6d
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Fri May 27 21:54:36 2022 +0900
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
Diff:
---
winsup/cygwin/cygheap.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 01b49468e..79300a31d 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,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-28 15:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-28 15:42 [newlib-cygwin/cygwin-3_3-branch] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory Takashi Yano
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).