Release: bump Welcome versions.

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

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 54449f907e3badb52d50d56a63cc50670838bcab..990e3d6d9161d983860b0c380e1a1139b17edf9c 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -1,16 +1,30 @@
 /*
-  file-name.cc - implement File_name
+  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-name.hh"
 
 #include <cstdio>
 #include <cerrno>
+#include <unistd.h>
+#include <limits.h>
+
 using namespace std;
 
 #include "config.hh"
@@ -19,10 +33,6 @@ using namespace std;
 #include <sys/stat.h>
 #endif
 
-#ifdef __CYGWIN__
-#include <sys/cygwin.h>
-#endif
-
 #ifndef ROOTSEP
 #define ROOTSEP ':'
 #endif
@@ -35,58 +45,98 @@ using namespace std;
 #define EXTSEP '.'
 #endif
 
-#ifdef __CYGWIN__
-static std::string
-dos_to_posix (std::string file_name)
+/** Use slash as directory separator.  On Windows, they can pretty
+    much be exchanged.  */
+#if 0
+static /* avoid warning */
+#endif
+string
+slashify (string file_name)
 {
-  char buf[PATH_MAX] = "";
-  char *s = file_name.get_copy_str0 ();
-  /* ugh: char const* argument gets modified.  */
-  int fail = cygwin_conv_to_posix_path (s, buf);
-  delete s;
-  if (!fail)
-    return buf;
+  replace_all (&file_name, '\\', '/');
+  replace_all (&file_name, string ("//"), "/");
   return file_name;
 }
-#endif /* __CYGWIN__ */
 
-/** Use slash as directory separator.  On Windows, they can pretty
-    much be exchanged.  */
-static std::string
-slashify (std::string file_name)
+string
+dir_name (const string &file_name)
 {
-  replace_all (file_name, '\\', '/');
-  replace_all (file_name, std::String ("//"), "/");
-  return file_name;
+  string s = file_name;
+  s = slashify (s);
+  ssize n = s.length ();
+  if (n && s[n - 1] == '/')
+    s[n - 1] = 0;
+  if (s.rfind ('/') != NPOS)
+    s = s.substr (0, s.rfind ('/'));
+  else
+    s = "";
+
+  return s;
+}
+
+string
+get_working_directory ()
+{
+#ifdef PATH_MAX
+  vector<char> cwd (PATH_MAX);
+#else
+  vector<char> cwd (1024);
+#endif
+  while (getcwd (cwd.data (), cwd.size ()) == NULL)
+    {
+      if (errno != ERANGE)
+        {
+          // getcwd () fails.
+          return "";
+        }
+      cwd.resize (cwd.size () * 2);
+    }
+  return string (cwd.data ());
 }
 
 /* Join components to full file_name. */
-std::string
-File_name::to_string () const
+string
+File_name::dir_part () const
 {
-  std::string s;
+  string s;
   if (!root_.empty ())
-    s = root_ + std::to_string (ROOTSEP);
+    s = root_ + ::to_string (ROOTSEP);
+
   if (!dir_.empty ())
     {
       s += dir_;
-      if (!base_.empty () || !ext_.empty ())
-       s += std::to_string (DIRSEP);
     }
-  s += base_;
+
+  return s;
+}
+
+string
+File_name::file_part () const
+{
+  string s;
+  s = base_;
   if (!ext_.empty ())
-    s += std::to_string (EXTSEP) + ext_;
+    s += ::to_string (EXTSEP) + ext_;
   return s;
 }
 
-File_name::File_name (std::string file_name)
+string
+File_name::to_string () const
+{
+  string d = dir_part ();
+  string f = file_part ();
+
+  if (!f.empty ()
+      && !dir_.empty ())
+    {
+      d += ::to_string (DIRSEP);
+    }
+
+  return d + f;
+}
+
+File_name::File_name (string file_name)
 {
-#ifdef __CYGWIN__
-  /* All system functions would work, even if we do not convert to
-     posix file_name, but we would think that \foe\bar\baz.ly is in
-     the cwd.  */
-  file_name = dos_to_posix (file_name);
-#endif
 #ifdef __MINGW32__
   file_name = slashify (file_name);
 #endif
@@ -119,14 +169,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 ();
 }
 
-#if 0 //STD_STRING
-File_name::File_name (String file_name)
+File_name
+File_name::canonicalized () const
 {
-  *this = File_name (std::string (file_name));
+  File_name c = *this;
+
+  replace_all (&c.dir_, string ("//"), string ("/"));
+
+  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 ();
+      else
+        new_components.push_back (components[i]);
+    }
+
+  c.dir_ = string_join (new_components, "/");
+  return c;
 }
-#endif