From 2fd3c233937904213f3e5389acaad2a516659f6b Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 1 Dec 2009 02:16:19 +0000 Subject: [PATCH] Undo this change. Like I said on the list, it is wrong to poll the environment variable every time it is accessed (especially given that there will be a command-line option for this). I'll commit a proper thing later tonight if I get to it. svn: r17122 --- .../scribblings/reference/filesystem.scrbl | 8 +++---- src/mzscheme/src/file.c | 24 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/collects/scribblings/reference/filesystem.scrbl b/collects/scribblings/reference/filesystem.scrbl index 39e9e5d4d7..240ece9b6d 100644 --- a/collects/scribblings/reference/filesystem.scrbl +++ b/collects/scribblings/reference/filesystem.scrbl @@ -81,11 +81,9 @@ by @scheme[kind], which must be one of the following: ]} @item{@indexed-scheme['addon-dir] --- a directory for installing PLT Scheme - extensions. This directory is specified by the @indexed-envvar{PLTADDONDIR} - environment variable. If the environment variable is undefined or not a legal - path name, this directory defaults to @filepath{Library/PLT Scheme} in the - user's home directory under Mac OS X and @scheme['pref-dir] otherwise. This - directory might not exist.} + extensions. It's the same as @scheme['pref-dir], except under Mac OS + X, where it is @filepath{Library/PLT Scheme} in the user's home + directory. This directory might not exist.} @item{@indexed-scheme['doc-dir] --- the standard directory for storing the current user's documents. Under Unix, it's the same as diff --git a/src/mzscheme/src/file.c b/src/mzscheme/src/file.c index 337118b3a2..ef2652bfc0 100644 --- a/src/mzscheme/src/file.c +++ b/src/mzscheme/src/file.c @@ -5768,19 +5768,6 @@ find_system_path(int argc, Scheme_Object **argv) return CURRENT_WD(); } - - /* first option for addon_dir: PLTADDONDIR environment variable */ - if (which == id_addon_dir) { - char* p; - - if ((p = getenv("PLTADDONDIR"))) { - p = scheme_expand_filename(p, -1, NULL, NULL, 0); - if (p) - return scheme_make_path(p); - } - - /* If PLTADDONDIR is undefined or malformed, fall through to default */ - } { /* Everything else is in ~: */ @@ -5867,17 +5854,6 @@ find_system_path(int argc, Scheme_Object **argv) return CURRENT_WD(); } - /* first option for addon_dir: PLTADDONDIR environment variable */ - if (which == id_addon_dir) { - if ((p = getenv("PLTADDONDIR"))) { - p = scheme_expand_filename(p, -1, NULL, NULL, 0); - if (p) - return scheme_make_path(p); - } - - /* If PLTADDONDIR is undefined or malformed, fall through to default */ - } - home = NULL; {