X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-name.cc;h=e5736e06b0834ed6c26e15e01f32d25d91682067;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=ac9e6832e0a351c7bf16ff25a6c124360a66fc70;hpb=d232ec8f99f1bcdf4781119ba28fc94a24a1e8db;p=lilypond.git

diff --git a/flower/file-name.cc b/flower/file-name.cc
index ac9e6832e0..e5736e06b0 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -11,6 +11,9 @@
 
 #include <cstdio>
 #include <cerrno>
+#include <unistd.h>
+
+using namespace std;
 
 #include "config.hh"
 
@@ -22,7 +25,6 @@
 #include <sys/cygwin.h>
 #endif
 
-/* We don't have multiple roots, set this to '\0'? */
 #ifndef ROOTSEP
 #define ROOTSEP ':'
 #endif
@@ -36,55 +38,101 @@
 #endif
 
 #ifdef __CYGWIN__
-static String
-dos_to_posix (String file_name)
+static string
+dos_to_posix (string file_name)
 {
-  char buf[PATH_MAX];
-  char *s = file_name.get_copy_str0 ();
-  /* urg, wtf? char const* argument gets modified! */
-  cygwin_conv_to_posix_path (s, buf);
-  delete s;
-  return buf;
+  char buf[PATH_MAX] = "";
+  char s[PATH_MAX] = {0};
+  file_name.copy (s, PATH_MAX - 1);
+  /* ugh: char const* argument gets modified.  */
+  int fail = cygwin_conv_to_posix_path (s, buf);
+  if (!fail)
+    return buf;
+  return file_name;
 }
 #endif /* __CYGWIN__ */
 
-#ifdef __MINGW32__
 /** Use slash as directory separator.  On Windows, they can pretty
     much be exchanged.  */
-static String
-slashify (String file_name)
+#if 0
+static /* avoid warning */
+#endif 
+string
+slashify (string file_name)
 {
-  if (file_name.index ('/'))
-    return file_name;
-  file_name.substitute ('\\', '/');
-  file_name.substitute ("\"", "\\\"");
-  file_name.substitute ("\'", "\\\'");
+  replace_all (file_name, '\\', '/');
+  replace_all (file_name, string ("//"), "/");
   return file_name;
 }
-#endif /* __MINGW32__ */
+
+string
+dir_name (string const 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 ()
+{
+  char cwd[PATH_MAX];
+  getcwd (cwd, PATH_MAX);
+
+  return string (cwd);
+}
 
 /* Join components to full file_name. */
-String
-File_name::to_string () const
+string
+File_name::dir_part () const
 {
-  String s;
-  if (!root_.is_empty ())
+  string s;
+  if (!root_.empty ())
     s = root_ + ::to_string (ROOTSEP);
-  if (!dir_.is_empty ())
-    s += dir_ + ::to_string (DIRSEP);
-  s += base_;
-  if (!ext_.is_empty ())
+
+  if (!dir_.empty ())
+    {
+      s += dir_;
+    }
+
+  return s;
+}
+
+
+string
+File_name::file_part () const
+{
+  string s;
+  s = base_;
+  if (!ext_.empty ())
     s += ::to_string (EXTSEP) + ext_;
   return s;
 }
 
-char const *
-File_name::to_str0 () const
+string
+File_name::to_string () const
 {
-  return to_string ().to_str0 ();
+  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)
+File_name::File_name (string file_name)
 {
 #ifdef __CYGWIN__
   /* All system functions would work, even if we do not convert to
@@ -96,26 +144,36 @@ File_name::File_name (String file_name)
   file_name = slashify (file_name);
 #endif
 
-  int i = file_name.index (ROOTSEP);
-  if (i >= 0)
+  ssize i = file_name.find (ROOTSEP);
+  if (i != NPOS)
     {
-      root_ = file_name.left_string (i);
-      file_name = file_name.right_string (file_name.length () - i - 1);
+      root_ = file_name.substr (0, i);
+      file_name = file_name.substr (i + 1);
     }
 
-  i = file_name.index_last (DIRSEP);
-  if (i >= 0)
+  i = file_name.rfind (DIRSEP);
+  if (i != NPOS)
     {
-      dir_ = file_name.left_string (i);
-      file_name = file_name.right_string (file_name.length () - i - 1);
+      dir_ = file_name.substr (0, i);
+      file_name = file_name.substr (i + 1);
     }
 
-  i = file_name.index_last ('.');
-  if (i >= 0)
+  i = file_name.rfind ('.');
+  if (i != NPOS)
     {
-      base_ = file_name.left_string (i);
-      ext_ = file_name.right_string (file_name.length () - i - 1);
+      base_ = file_name.substr (0, i);
+      ext_ = file_name.substr (i + 1);
     }
   else
     base_ = file_name;
 }
+
+bool
+File_name::is_absolute () const
+{
+  /*
+    Hmm. Is c:foo absolute?  
+   */
+  return (dir_.length () && dir_[0] == DIRSEP) || root_.length ();
+}
+