* The grand 2005-2006 replace.

[lilypond.git] / flower / file-path.cc

diff --git a/flower/file-path.cc b/flower/file-path.cc
index c66909eae37de55333548cde84a50f414fe9d24c..74b0b25cd055aae9345e868dd68d7f9c017e76e3 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -149,26 +149,23 @@ File_path::find (String name) const
 String
 File_path::find (String name, char const *extensions[])
 {
-  File_name file_name (name);
   if (name.is_empty () || name == "-")
-    file_name.base_ = "-";
-  else
+    return name;
+  
+  File_name file_name (name);
+  String orig_ext = file_name.ext_;
+  for (int i = 0; extensions[i]; i++)
     {
-      String orig_ext = file_name.ext_;
-      for (int i = 0; extensions[i]; i++)
-       {
-         file_name.ext_ = orig_ext;
-         if (*extensions[i] && !file_name.ext_.is_empty ())
-           file_name.ext_ += ".";
-         file_name.ext_ += extensions[i];
-         if (!find (file_name.to_string ()).is_empty ())
-           break;
-       }
-
-      /* Reshuffle extension */
-      file_name = File_name (file_name.to_string ());
+      file_name.ext_ = orig_ext;
+      if (*extensions[i] && !file_name.ext_.is_empty ())
+       file_name.ext_ += ".";
+      file_name.ext_ += extensions[i];
+      String found = find (file_name.to_string ());
+      if (!found.is_empty ())
+       return found;
     }
-  return file_name.to_string ();
+  
+  return "";
 }
 
 /** Append a directory, return false if failed.  */