(prepend_env_path): Bugfix: Check directory

existence before appending original path.

diff --git a/ChangeLog b/ChangeLog
index d0d27b06bc7bacff1c0092f1070b1447dbeea1bf..3aee43cccf9ef37a6cfebb2115c67242f1b219b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/main.cc (prepend_env_path): Bugfix: Check directory
+       existence before appending original path.
+
 2005-06-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * ttftool/parse.c (readNamingTable): verbosity for "bad TTF

diff --git a/lily/main.cc b/lily/main.cc
index 80edfc07ed312fdedafd6c40501fd7b2f981e807..3986817c6e4c71b0b5748919b105e08fc43df9df 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -282,10 +282,12 @@ set_env_file (char const* key, String value)
 static int
 prepend_env_path (char const *key, String value)
 {
-  if (char const* cur = getenv (key))
-    value += to_string (PATHSEP) + cur;
   if (is_dir (value))
-    return sane_putenv (key, value.to_str0 ());
+    {
+      if (char const* cur = getenv (key))
+       value += to_string (PATHSEP) + cur;
+      return sane_putenv (key, value.to_str0 ());
+    }
   else if (be_verbose_global)
     warning (_f ("no such directory: %s", value));
   return -1;