public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
Date: Sat, 28 May 2022 15:42:30 +0000 (GMT)	[thread overview]
Message-ID: <20220528154230.3A2EC3860C3C@sourceware.org> (raw)

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,


                 reply	other threads:[~2022-05-28 15:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220528154230.3A2EC3860C3C@sourceware.org \
    --to=tyan0@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).