Imported Debian patch 2.12.3-1

[lilypond.git] / lily / relocate.cc

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 2ff9fc44d37e7721780bf791d07d4398ac588f1e..67926e531cb552a5054138b5b2ed4626e652a600 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -14,8 +14,10 @@
 
 /* TODO: autoconf support */
 
+#include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <cstring>
 
 #if HAVE_GETTEXT
 #include <libintl.h>
@@ -230,12 +232,8 @@ setup_paths (char const *argv0_ptr)
 
   if (char const *env = getenv ("LILYPOND_DATADIR"))
     {
-#ifdef __MINGW32__
       /* Normalize file name.  */
       lilypond_datadir = File_name (env).to_string ();
-#else
-      lilypond_datadir = env;
-#endif
     }
 
   /* When running from build dir, a full LILYPOND_DATADIR is set-up at
@@ -245,6 +243,9 @@ setup_paths (char const *argv0_ptr)
   if (!is_dir (lilypond_datadir.c_str ())
       && is_dir (build_datadir_current.c_str ()))
     lilypond_datadir = build_datadir_current;
+
+
+  lilypond_datadir = File_name (lilypond_datadir).canonicalized().to_string();
   
   global_path.append ("");
 
@@ -270,20 +271,20 @@ setup_paths (char const *argv0_ptr)
 string
 expand_environment_variables (string orig)
 {
-  const char *start_ptr = orig.c_str ();
-  const char *ptr = orig.c_str ();
+  char const *start_ptr = orig.c_str ();
+  char const *ptr = orig.c_str ();
   size_t len = orig.length ();
 
   string out;
   while (ptr < start_ptr + len)
     {
-      char *dollar = strchr (ptr, '$');
+      char const *dollar = strchr (ptr, '$');
       
       if (dollar != NULL)
        {
-         char *start_var = dollar + 1;
-         char *end_var = start_var;
-         char *start_next = end_var;
+         char const *start_var = dollar + 1;
+         char const *end_var = start_var;
+         char const *start_next = end_var;
          
          out += string (ptr, dollar - ptr);
          ptr = dollar;
@@ -320,7 +321,7 @@ expand_environment_variables (string orig)
          if (start_var < end_var)
            {
              string var_name (start_var, end_var - start_var);
-             const char *value = getenv (var_name.c_str ());
+             char const *value = getenv (var_name.c_str ());
              if (value != NULL)
                out += string (value);
 
@@ -337,7 +338,7 @@ expand_environment_variables (string orig)
   return out;
 }
 
-
+// Ugh - very inefficient, but safer than fgets.
 static string
 read_line (FILE *f)
 {
@@ -345,7 +346,7 @@ read_line (FILE *f)
   
   int c = 0;
   while ((c = fgetc (f)) != EOF && c != '\n')
-    out += c;
+    out += char(c);
 
   return out;
 }