public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Ken Brown <kbrown@cornell.edu>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH] Cygwin: cygheap: Fix the issue of cygwin1.dll in the root directory.
Date: Sat, 28 May 2022 11:23:15 -0400	[thread overview]
Message-ID: <6e88d941-fbc9-b0e7-1052-9cab1e3181e4@cornell.edu> (raw)
In-Reply-To: <20220528142045.8402-1-takashi.yano@nifty.ne.jp>

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

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

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-28 14:20 Takashi Yano
2022-05-28 15:23 ` Ken Brown [this message]

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=6e88d941-fbc9-b0e7-1052-9cab1e3181e4@cornell.edu \
    --to=kbrown@cornell.edu \
    --cc=cygwin-patches@cygwin.com \
    /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).