X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-name.cc;h=c24c0731e4f237bccba2ac3dd1d0b8b450210a19;hb=b51ccf16e888af1e16b5c6fe733a04e7349de06a;hp=bf645df23d78ecdd3fccb67d90978214765477f7;hpb=84dfa31321b6f0c3224ed8c586b64ec97e88402f;p=lilypond.git

diff --git a/flower/file-name.cc b/flower/file-name.cc
index bf645df23d..c24c0731e4 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -1,10 +1,21 @@
 /*
-  file-name.cc - implement File_name
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
-
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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-name.hh"
@@ -57,12 +68,12 @@ dos_to_posix (string file_name)
     much be exchanged.  */
 #if 0
 static /* avoid warning */
-#endif 
+#endif
 string
 slashify (string file_name)
 {
-  replace_all (file_name, '\\', '/');
-  replace_all (file_name, string ("//"), "/");
+  replace_all (&file_name, '\\', '/');
+  replace_all (&file_name, string ("//"), "/");
   return file_name;
 }
 
@@ -78,7 +89,7 @@ dir_name (string const file_name)
     s = s.substr (0, s.rfind ('/'));
   else
     s = "";
-  
+
   return s;
 }
 
@@ -86,9 +97,8 @@ string
 get_working_directory ()
 {
   char cwd[PATH_MAX];
-  getcwd (cwd, PATH_MAX);
-
-  return string (cwd);
+  // getcwd returns NULL upon a failure, contents of cwd would be undefined!
+  return string (getcwd (cwd, PATH_MAX));
 }
 
 /* Join components to full file_name. */
@@ -107,7 +117,6 @@ File_name::dir_part () const
   return s;
 }
 
-
 string
 File_name::file_part () const
 {
@@ -125,7 +134,7 @@ File_name::to_string () const
   string f = file_part ();
 
   if (!f.empty ()
-      && !dir_.empty())
+      && !dir_.empty ())
     {
       d += ::to_string (DIRSEP);
     }
@@ -173,31 +182,29 @@ bool
 File_name::is_absolute () const
 {
   /*
-    Hmm. Is c:foo absolute?  
+    Hmm. Is c:foo absolute?
    */
   return (dir_.length () && dir_[0] == DIRSEP) || root_.length ();
 }
 
-
-
 File_name
 File_name::canonicalized () const
 {
   File_name c = *this;
 
-  replace_all (c.dir_, string ("//"), string ("/"));
+  replace_all (&c.dir_, string ("//"), string ("/"));
 
-  vector<string> components =  string_split (c.dir_, '/');
+  vector<string> components = string_split (c.dir_, '/');
   vector<string> new_components;
 
   for (vsize i = 0; i < components.size (); i++)
     {
       if (components[i] == "..")
-	new_components.pop_back ();
+        new_components.pop_back ();
       else
-	new_components.push_back (components[i]);
+        new_components.push_back (components[i]);
     }
 
-  c.dir_ = string_join (new_components,  "/");
-  return c;  
+  c.dir_ = string_join (new_components, "/");
+  return c;
 }