summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/environ.cc4
2 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 74fe237aa..a7893a5b4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
2011-06-09 Christopher Faylor <me.cygwin2011@cgf.cx>
+ * environ.cc (envcache): Delete.
+ (known): Remove envcache.
+ (getwinenv): Don't honor envcache setting.
+
+2011-06-09 Christopher Faylor <me.cygwin2011@cgf.cx>
+
* environ.c: Move code earlier to allow:
(_addenv): Call parse_options() when CYGWIN environment variable is
being changed.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 3e71cbf2c..0dc00c1af 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -36,7 +36,6 @@ extern bool dos_file_warning;
extern bool ignore_case_with_glob;
extern bool allow_winsymlinks;
bool reset_com = false;
-static bool envcache = true;
static bool create_upcaseenv = false;
static char **lastenviron;
@@ -119,7 +118,6 @@ static struct parse_thing
} known[] NO_COPY =
{
{"dosfilewarning", {&dos_file_warning}, justset, NULL, {{false}, {true}}},
- {"envcache", {&envcache}, justset, NULL, {{true}, {false}}},
{"error_start", {func: error_start_init}, isfunc, NULL, {{0}, {0}}},
{"export", {&export_settings}, justset, NULL, {{false}, {true}}},
{"glob", {func: glob_init}, isfunc, NULL, {{0}, {s: "normal"}}},
@@ -349,7 +347,7 @@ getwinenv (const char *env, const char *in_posix, win_env *temp)
if (!cur_environ () || !(val = in_posix ?: getenv (we->name)))
debug_printf ("can't set native for %s since no environ yet",
we->name);
- else if (!envcache || !we->posix || strcmp (val, we->posix) != 0)
+ else if (!we->posix || strcmp (val, we->posix) != 0)
{
if (temp)
{