release: 0.1.39

[lilypond.git] / flower / path.cc

diff --git a/flower/path.cc b/flower/path.cc
index b69d85d77a499515b7b5f709cbc8f6fca662ee85..a499d0abf4ee3d6572dffb8dbc145a8bf9d44c03 100644 (file)
--- a/flower/path.cc
+++ b/flower/path.cc
@@ -5,8 +5,12 @@
 #include "path.hh"
 #include "flower-debug.hh"
 
+#ifndef DIRSEP
+#define DIRSEP '/'
+#endif
+
 #ifndef PATHSEP
-#define PATHSEP '/'
+#define PATHSEP ':'
 #endif
 
 /**
@@ -15,40 +19,58 @@
 */
 void
 split_path (String path,
-          String &drive, String &dirs, String &filebase, String &extension)
+           String &drive, String &dirs, String &filebase, String &extension)
 {
   // peel off components, one by one.
   int di = path.index_i (':');
   if (di >= 0)
-       {
-       drive = path.left_str (di + 1);
-       path = path.right_str (path.len() - di -1);
-         }
+    {
+      drive = path.left_str (di + 1);
+      path = path.right_str (path.len() - di -1);
+    }
   else
-       drive = "";
+    drive = "";
 
-  di = path.index_last_i (PATHSEP);
+  di = path.index_last_i (DIRSEP);
   if (di >=0)
-       {
-       dirs = path.left_str (di + 1);
-       path = path.right_str (path.len()-di -1);
-         }
+    {
+      dirs = path.left_str (di + 1);
+      path = path.right_str (path.len()-di -1);
+    }
   else
-       dirs = "";
+    dirs = "";
 
   di = path.index_last_i ('.');
   if (di >= 0)
-       {
-       filebase = path.left_str (di);
-       extension =path.right_str (path.len()-di);
-         }
+    {
+      filebase = path.left_str (di);
+      extension =path.right_str (path.len()-di);
+    }
   else
-       {
-       extension = "";
-       filebase = path;
-         }
+    {
+      extension = "";
+      filebase = path;
+    }
 }
 
+void
+File_path::parse_path (String p)
+{
+  int l;
+  
+  while ( (l = p.length_i ()) )
+    {
+      int i = p.index_i(PATHSEP);
+      if (i <0) 
+       i = l;
+      add (p.left_str(i));
+      p = p.right_str (l- i - 1);
+    }
+}
+
+
+
+
 /** find a file.
   It will search in the current dir, in the construction-arg, and
   in any other added path, in this order.
@@ -59,25 +81,24 @@ File_path::find (String nm) const
 {
   fdebug << _("looking for ") << nm << ": ";
   if (!nm.length_i() || (nm == "-") )
-       return nm;
+    return nm;
   for (int i=0; i < size(); i++)
     {
+      String path  = elem(i);
+      if (path.length_i() )
+       path += "/";
 
-        String path  = elem(i);
-        if (path.length_i() )
-            path += "/";
+      path += nm;
 
-        path += nm;
-
-        fdebug << path << "? ";
-        FILE *f = fopen (path.ch_C(), "r"); // ugh!
-        if (f)
-          {
-            fdebug << _("found\n");
-            fclose (f);
-            return path;
-          }
-     }
+      fdebug << path << "? ";
+      FILE *f = fopen (path.ch_C(), "r"); // ugh!
+      if (f)
+       {
+         fdebug << _("found\n");
+         fclose (f);
+         return path;
+       }
+    }
   fdebug << "\n";
   return "";
 }