From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 8 Jun 2005 12:31:23 +0000 (+0000)
Subject: (prepend_env_path): Bugfix: Check directory
X-Git-Tag: release/2.5.30~28
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b02113ba8ff6fe9db914f368a8dca1fb26738049;p=lilypond.git

(prepend_env_path): Bugfix: Check directory
existence before appending original path.
---

diff --git a/ChangeLog b/ChangeLog
index d0d27b06bc..3aee43cccf 100644
--- 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 80edfc07ed..3986817c6e 100644
--- 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;