add 2007 to (c) year.

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

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 66b1aaa1149a38e03d394966985ffaa7878f1ac6..e5736e06b0834ed6c26e15e01f32d25d91682067 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -42,7 +42,7 @@ static string
 dos_to_posix (string file_name)
 {
   char buf[PATH_MAX] = "";
-  char s[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);
@@ -73,7 +73,11 @@ dir_name (string const file_name)
   ssize n = s.length ();
   if (n && s[n - 1] == '/')
     s[n - 1] = 0;
-  s = s.substr (0, s.rfind ('/'));
+  if (s.rfind ('/') != NPOS)
+    s = s.substr (0, s.rfind ('/'));
+  else
+    s = "";
+  
   return s;
 }
 
@@ -88,23 +92,46 @@ get_working_directory ()
 
 /* Join components to full file_name. */
 string
-File_name::to_string () const
+File_name::dir_part () const
 {
   string s;
   if (!root_.empty ())
     s = root_ + ::to_string (ROOTSEP);
+
   if (!dir_.empty ())
     {
       s += dir_;
-      if (!base_.empty () || !ext_.empty ())
-       s += ::to_string (DIRSEP);
     }
-  s += base_;
+
+  return s;
+}
+
+
+string
+File_name::file_part () const
+{
+  string s;
+  s = base_;
   if (!ext_.empty ())
     s += ::to_string (EXTSEP) + ext_;
   return s;
 }
 
+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__