/*
- file-path.cc - implement File_path
+ 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--2011 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-path.hh"
-#include "std-string.hh"
-
#include <cstdio>
#include <cerrno>
return dirs_;
}
-/*
- TODO: use split_string.
-
- */
-
#include <algorithm>
void
File_path::parse_path (string p)
{
- ssize len;
- while ((len = p.length ()))
- {
- ssize i = p.find (PATHSEP);
- if (i == NPOS)
- i = len;
- append (p.substr (0, i));
- p = p.substr (min (len, i + 1));
- }
+ concat (dirs_, string_split (p, PATHSEP));
}
bool
bool
is_dir (string file_name)
{
+ /*
+ canonicalize; in particular, trailing slashes should disappear.
+ */
+ file_name = File_name (file_name).to_string ();
+
#if !STAT_MACROS_BROKEN
struct stat sbuf;
if (stat (file_name.c_str (), &sbuf) != 0)