X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=6f307a0ee594f363865727944208da036e606ce6;hb=8e3d69a83919b4754f73c1ad99239938d157edb8;hp=fd6cf85c458f2fbac7dd76ae8c3bae1f8c8b3714;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git

diff --git a/lily/relocate.cc b/lily/relocate.cc
index fd6cf85c45..6f307a0ee5 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -1,10 +1,20 @@
 /*
-  relocate.cc -- implement relocation based on argv0
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "relocate.hh"
@@ -269,20 +279,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 +329,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);