From e237a253f77291bee26a98fde762d8d543e7ff5f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 21 Apr 2006 21:02:13 +0000
Subject: [PATCH] (expand_environment_variables): new function. (read_line):
 id. (read_relocation_file): id.

---
 ChangeLog        |   4 ++
 THANKS           |   2 +-
 lily/main.cc     |   3 ++
 lily/relocate.cc | 127 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2cbec4e08e..2f1c086e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/relocate.cc (expand_environment_variables): new function.
+	(read_line): id.
+	(read_relocation_file): id.
+
 	* scm/stencil.scm (eps-file->stencil): fix EPS PS embedding code 
 
 2006-04-21  Erlend Aasland  <erlenda@gmail.com>
diff --git a/THANKS b/THANKS
index 9ea568b509..112cec27c2 100644
--- a/THANKS
+++ b/THANKS
@@ -41,12 +41,12 @@ Colin Wilding
 David Rogers
 J. Leung
 Harald Wellmann
+Keith Packard
 Orm Finnendahl
 Rick Hansen
 Stephen Carter
 Werner Lemberg
 
-
 Release 2.8
 ***********
 
diff --git a/lily/main.cc b/lily/main.cc
index 255efe5b80..481d4542a6 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -604,12 +604,15 @@ setup_guile_env ()
   sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
 }
 
+void read_relocation_file(string);
 int
 main (int argc, char **argv)
 {
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
+  read_relocation_file ("test.reloc");
+
   setup_localisation ();
   parse_argv (argc, argv);
   if (isatty (STDIN_FILENO))
diff --git a/lily/relocate.cc b/lily/relocate.cc
index 6bfbc8ae57..65e4bc29a7 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -277,3 +277,130 @@ setup_paths (char const *argv0_ptr)
   for (vsize i = 0; i < dirs.size (); i++)
     global_path.prepend (dirs[i]);
 }
+
+
+
+string
+expand_environment_variables (string orig)
+{
+  const char *start_ptr = orig.c_str();
+  const char *ptr = orig.c_str();
+  size_t len = orig.length();
+
+  string out;
+  while (ptr < start_ptr + len)
+    {
+      char *dollar = strchr (ptr, '$');
+      
+      if (dollar != NULL)
+	{
+	  char *start_var = dollar + 1;
+	  char *end_var = start_var;
+	  char *start_next = end_var;
+	  
+	  out += string (ptr, dollar - ptr);
+	  ptr = dollar;
+
+	  if (*start_var == '{')
+	    {
+	      start_var ++;
+	      
+	      end_var = strchr (start_var, '}');
+	      
+	      if (end_var == NULL)
+		{
+		  end_var = start_var + len;
+		  start_next = end_var;
+		}
+	      else
+		{
+		  start_next = end_var + 1; 
+		}
+	    }
+	  else 
+	    {
+	      /*
+		Hmm. what to do for $1 , $~ etc.?
+	       */
+	      do
+		{
+		  end_var ++;
+		}
+	      while (isalnum (*end_var) || *end_var == '_');
+	      start_next = end_var;
+	    }
+
+	  if (start_var < end_var)
+	    {
+	      string var_name (start_var, end_var - start_var);
+	      const char *value = getenv (var_name.c_str());
+	      if (value != NULL)
+		out += string (value);
+
+	      ptr = start_next;
+	    }
+	}
+      else
+	break;
+
+    }
+
+  out += ptr;
+
+  return out;
+}
+
+
+string
+read_line (FILE *f)
+{
+  string out;
+  
+  int c = 0;
+  while ((c = fgetc (f)) != EOF && c != '\n')
+    out += c;
+
+  return out;
+}
+
+void
+read_relocation_file (string filename)
+{
+  char const *cname = filename.c_str ();
+  FILE *f = fopen (cname, "r");
+  if (!f)
+    error (_f ("can't open file %s", cname));
+
+  while (!feof (f))
+    {
+      string line = read_line (f);
+      size_t idx = line.find (' ');
+      if (idx == NPOS)
+	continue;
+      
+      string command = line.substr (0, idx);
+      line = line.substr (idx + 1);
+      
+      if (idx == NPOS)
+	continue;
+      idx = line.find ('=');
+
+      string variable = line.substr (0, idx);
+      string value = line.substr (idx + 1);
+
+      value = expand_environment_variables (value);
+
+      if (command == "set")
+	sane_putenv (variable.c_str(), value, true);
+      else if (command == "setdir")
+	set_env_dir (variable.c_str(), value);
+      else if (command == "setfile")
+	set_env_file (variable.c_str(), value);
+      else if (command == "prependdir")
+	prepend_env_path (variable.c_str (), value);
+      else
+	error ( _f("Unknown relocation command %s", command));
+    }
+
+  fclose (f);
+}
-- 
2.39.5