X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=67926e531cb552a5054138b5b2ed4626e652a600;hb=a8bf97b6b7f724102ecef1d220c71f090bc45657;hp=42c54a65ff3863bf3d9635b9a21b3956f46698ed;hpb=5ae46f750bfb3a947d4adc26044560da54c21e17;p=lilypond.git

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 42c54a65ff..67926e531c 100644
--- 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>
@@ -269,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;
@@ -319,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);
 
@@ -336,7 +338,7 @@ expand_environment_variables (string orig)
   return out;
 }
 
-
+// Ugh - very inefficient, but safer than fgets.
 static string
 read_line (FILE *f)
 {
@@ -344,7 +346,7 @@ read_line (FILE *f)
   
   int c = 0;
   while ((c = fgetc (f)) != EOF && c != '\n')
-    out += c;
+    out += char(c);
 
   return out;
 }