X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-name.cc;h=2302baa46b6a0647f72be83f4a4e44a043d26f7f;hb=932933b488622911d513602970f0cfc6d5cdb93c;hp=cf9dc82fef14ca3bc6ed8b04975aff5f4bad89b9;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/flower/file-name.cc b/flower/file-name.cc
index cf9dc82fef..2302baa46b 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -1,20 +1,21 @@
 /*
   file-name.cc - implement File_name
-   
+
   source file of the Flower Library
-  
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "file-name.hh"
 
 #include <cstdio>
 #include <cerrno>
+using namespace std;
 
 #include "config.hh"
 
-#if HAVE_SYS_STAT_H 
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 
@@ -22,7 +23,6 @@
 #include <sys/cygwin.h>
 #endif
 
-/* We don't have multiple roots, set this to '\0'? */
 #ifndef ROOTSEP
 #define ROOTSEP ':'
 #endif
@@ -36,68 +36,97 @@
 #endif
 
 #ifdef __CYGWIN__
-static String
-dos_to_posix (String file_name)
+static std::string
+dos_to_posix (std::string file_name)
 {
-  char buf[PATH_MAX];
+  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);
+  /* ugh: char const* argument gets modified.  */
+  int fail = cygwin_conv_to_posix_path (s, buf);
   delete s;
-  return buf;
+  if (!fail)
+    return buf;
+  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)
+{
+  replace_all (file_name, '\\', '/');
+  replace_all (file_name, std::string ("//"), "/");
+  return file_name;
+}
+
 /* Join components to full file_name. */
-String
+std::string
 File_name::to_string () const
 {
-  String s;
-  if (!root_.is_empty ())
-    s = root_ + ::to_string (ROOTSEP);
-  if (!dir_.is_empty ())
-    s += dir_ + ::to_string (DIRSEP);
+  std::string s;
+  if (!root_.empty ())
+    s = root_ + std::to_string (ROOTSEP);
+  if (!dir_.empty ())
+    {
+      s += dir_;
+      if (!base_.empty () || !ext_.empty ())
+	s += std::to_string (DIRSEP);
+    }
   s += base_;
-  if (!ext_.is_empty ())
-    s += ::to_string (EXTSEP) + ext_;
+  if (!ext_.empty ())
+    s += std::to_string (EXTSEP) + ext_;
   return s;
 }
 
-char const*
-File_name::to_str0 () const
-{
-  return to_string ().to_str0 ();
-}
-
-File_name::File_name (String file_name)
+File_name::File_name (std::string file_name)
 {
 #ifdef __CYGWIN__
-  /* All system functions would work, even if we don't convert to
-     posix file_name, but we'd think that \foe\bar\baz.ly is in the cwd.
-     On by default.  */
+  /* 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
 
-  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 ();
+}
+
+#if 0 //STD_STRING
+File_name::File_name (String file_name)
+{
+  *this = File_name (std::string (file_name));
+}
+#endif