diff options
| author |  Stephane Glondu <steph@glondu.net> | 2011-04-19 16:44:20 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2011-04-19 16:44:20 +0200 |
| commit | 9d27ae09786866b6e3d7b79d1fa7667e5e2aa309 (patch) | |
| tree | a418d1edb3d53cdb4185b9719b7a70822cf5a24d /lib/system.ml | |
| parent | 6b691bbd2101fd39395c0d2135fd7c06a8915e14 (diff) | |
Imported Upstream version 8.3.pl2upstream/8.3.pl2
Diffstat (limited to 'lib/system.ml')
| -rw-r--r-- | lib/system.ml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/system.ml b/lib/system.ml index 17d211f8..7744a79b 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: system.ml 13323 2010-07-24 15:57:30Z herbelin $ *) +(* $Id: system.ml 13750 2010-12-24 09:55:54Z letouzey $ *) open Pp open Util @@ -19,12 +19,21 @@ let safe_getenv_def var def = Sys.getenv var with Not_found -> warning ("Environment variable "^var^" not found: using '"^def^"' ."); - flush Pervasives.stdout; + flush_all (); def let getenv_else s dft = try Sys.getenv s with Not_found -> dft -let home = (safe_getenv_def "HOME" ".") +(* On win32, the home directory is probably not in $HOME, but in + some other environment variable *) + +let home = + try Sys.getenv "HOME" with Not_found -> + try (Sys.getenv "HOMEDRIVE")^(Sys.getenv "HOMEPATH") with Not_found -> + try Sys.getenv "USERPROFILE" with Not_found -> + warning ("Cannot determine user home directory, using '.' ."); + flush_all (); + "." let safe_getenv n = safe_getenv_def n ("$"^n) |