X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-path.cc;h=65cd517e5a07247fc798277631be1857601679e0;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=63ecdb833ab46a451f98f493e25b8e6bfe080b56;hpb=52a1eeedba4fa981ef9695e1d9e0fed981b8903e;p=lilypond.git

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 63ecdb833a..65cd517e5a 100644
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -1,16 +1,25 @@
 /*
-  file-path.cc - implement File_path
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
-
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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 "file-path.hh"
 
-#include "std-string.hh"
-
 #include <cstdio>
 #include <cerrno>
 
@@ -30,21 +39,22 @@
 #define PATHSEP ':'
 #endif
 
+#include <algorithm>
+
 vector<string>
 File_path::directories () const
 {
   return dirs_;
 }
 
-#include <algorithm>
 void
-File_path::parse_path (string p)
+File_path::parse_path (const string &p)
 {
   concat (dirs_, string_split (p, PATHSEP));
 }
 
 bool
-is_file (string file_name)
+is_file (const string &file_name)
 {
 #if !STAT_MACROS_BROKEN
   struct stat sbuf;
@@ -70,7 +80,7 @@ is_dir (string file_name)
     canonicalize; in particular, trailing slashes should disappear.
    */
   file_name = File_name (file_name).to_string ();
-  
+
 #if !STAT_MACROS_BROKEN
   struct stat sbuf;
   if (stat (file_name.c_str (), &sbuf) != 0)
@@ -97,7 +107,7 @@ directory, in this order.
 The file name if found, or empty string if not found. */
 
 string
-File_path::find (string name) const
+File_path::find (const string &name) const
 {
   if (!name.length () || (name == "-"))
     return name;
@@ -119,12 +129,12 @@ File_path::find (string name) const
       file_name.root_ = dir.root_;
       dir.root_ = "";
       if (file_name.dir_.empty ())
-	file_name.dir_ = dir.to_string ();
+        file_name.dir_ = dir.to_string ();
       else if (!dir.to_string ().empty ())
-	file_name.dir_ = dir.to_string ()
-	  + ::to_string (DIRSEP) + file_name.dir_;
+        file_name.dir_ = dir.to_string ()
+                         + ::to_string (DIRSEP) + file_name.dir_;
       if (is_file (file_name.to_string ()))
-	return file_name.to_string ();
+        return file_name.to_string ();
     }
   return "";
 }
@@ -137,24 +147,24 @@ File_path::find (string name) const
   where EXT is from EXTENSIONS.
 */
 string
-File_path::find (string name, char const *extensions[])
+File_path::find (const string &name, char const *extensions[])
 {
   if (name.empty () || name == "-")
     return name;
-  
+
   File_name file_name (name);
   string orig_ext = file_name.ext_;
   for (int i = 0; extensions[i]; i++)
     {
       file_name.ext_ = orig_ext;
       if (*extensions[i] && !file_name.ext_.empty ())
-	file_name.ext_ += ".";
+        file_name.ext_ += ".";
       file_name.ext_ += extensions[i];
       string found = find (file_name.to_string ());
       if (!found.empty ())
-	return found;
+        return found;
     }
-  
+
   return "";
 }
 
@@ -180,19 +190,19 @@ File_path::to_string () const
     {
       s = s + dirs_[i];
       if (i < dirs_.size () - 1)
-	s += ::to_string (PATHSEP);
+        s += ::to_string (PATHSEP);
     }
   return s;
 }
 
 void
-File_path::append (string str)
+File_path::append (const string &str)
 {
   dirs_.push_back (str);
 }
 
 void
-File_path::prepend (string str)
+File_path::prepend (const string &str)
 {
   dirs_.insert (dirs_.begin (), str);
 }