Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 3ec427640bb7b673597b3673875c562027a08472..66b1aaa1149a38e03d394966985ffaa7878f1ac6 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -11,6 +11,8 @@
 
 #include <cstdio>
 #include <cerrno>
+#include <unistd.h>
+
 using namespace std;
 
 #include "config.hh"
@@ -36,14 +38,14 @@ using namespace std;
 #endif
 
 #ifdef __CYGWIN__
-static std::string
-dos_to_posix (std::string file_name)
+static string
+dos_to_posix (string file_name)
 {
   char buf[PATH_MAX] = "";
-  char *s = file_name.get_copy_str0 ();
+  char s[PATH_MAX];
+  file_name.copy (s, PATH_MAX - 1);
   /* ugh: char const* argument gets modified.  */
   int fail = cygwin_conv_to_posix_path (s, buf);
-  delete s;
   if (!fail)
     return buf;
   return file_name;
@@ -55,34 +57,55 @@ dos_to_posix (std::string file_name)
 #if 0
 static /* avoid warning */
 #endif 
-std::string
-slashify (std::string file_name)
+string
+slashify (string file_name)
 {
   replace_all (file_name, '\\', '/');
-  replace_all (file_name, std::string ("//"), "/");
+  replace_all (file_name, string ("//"), "/");
   return file_name;
 }
 
+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;
+  s = s.substr (0, s.rfind ('/'));
+  return s;
+}
+
+string
+get_working_directory ()
+{
+  char cwd[PATH_MAX];
+  getcwd (cwd, PATH_MAX);
+
+  return string (cwd);
+}
+
 /* Join components to full file_name. */
-std::string
+string
 File_name::to_string () 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 += ::to_string (DIRSEP);
     }
   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)
+File_name::File_name (string file_name)
 {
 #ifdef __CYGWIN__
   /* All system functions would work, even if we do not convert to