743bae3086
Provides and conflicts with msys2-runtime, so can be used to replace it if wanted. Keep this as a separate package to test for regressions in cygwin and to have (in theory) a runtime that supports 32bit in the repo. There is no guarantee for how long we are going to keep this.
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 5812c2fb3534a9203cc110cc052fdae730920a3e Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Wed, 18 Feb 2015 12:32:17 +0000
|
|
Subject: [PATCH 38/N] Pass environment variables with empty values
|
|
|
|
There is a difference between an empty value and an unset environment
|
|
variable. We should not confuse both; If the user wants to unset an
|
|
environment variable, they can certainly do so (unsetenv(3), or in the
|
|
shell: 'unset ABC').
|
|
|
|
This fixes Git's t3301-notes.sh, which overrides environment variables
|
|
with empty values.
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
---
|
|
winsup/cygwin/environ.cc | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
|
|
index 5afac8d..522d7d5 100644
|
|
--- a/winsup/cygwin/environ.cc
|
|
+++ b/winsup/cygwin/environ.cc
|
|
@@ -1339,11 +1339,11 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
|
|
Note that this doesn't stop invalid strings without '=' in it
|
|
etc., but we're opting for speed here for now. Adding complete
|
|
checking would be pretty expensive. */
|
|
- if (len == 1 || !*rest)
|
|
+ if (len == 1)
|
|
continue;
|
|
|
|
/* See if this entry requires posix->win32 conversion. */
|
|
- conv = getwinenv (*srcp, rest, &temp);
|
|
+ conv = !*rest ? NULL : getwinenv (*srcp, rest, &temp);
|
|
if (conv)
|
|
{
|
|
p = conv->native; /* Use win32 path */
|
|
@@ -1357,7 +1357,7 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
|
|
}
|
|
}
|
|
#ifdef __MSYS__
|
|
- else if (!keep_posix) {
|
|
+ else if (!keep_posix && *rest) {
|
|
char *win_arg = arg_heuristic_with_exclusions
|
|
(*srcp, msys2_env_conv_excl_env, msys2_env_conv_excl_count);
|
|
debug_printf("WIN32_PATH is %s", win_arg);
|