/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
path_ = 0;
}
-
Sources::Sources (Sources const &)
{
assert (false);
}
-
void
Sources::set_path (File_path *f)
{
working directory.
*/
Source_file *
-Sources::get_file (string file_string, string const& current_dir)
-{
+Sources::get_file (string file_string, string const ¤t_dir)
+{
if (file_string != "-")
{
// First, check for a path relative to the directory of the
// file currently being parsed.
if (current_dir.length ()
- && file_string.length ()
- && !File_name (file_string).is_absolute ()
- && is_file (current_dir + DIRSEP + file_string))
- file_string = current_dir + DIRSEP + file_string;
+ && file_string.length ()
+ && !File_name (file_string).is_absolute ()
+ && is_file (current_dir + DIRSEP + file_string))
+ file_string = current_dir + DIRSEP + file_string;
// Otherwise, check the rest of the path.
else if (path_)
- {
- string file_string_o = path_->find (file_string);
- if ((file_string_o == "") && (file_string != ""))
- return 0;
+ {
+ string file_string_o = path_->find (file_string);
+ if ((file_string_o == "") && (file_string != ""))
+ return 0;
- file_string = file_string_o;
- }
+ file_string = file_string_o;
+ }
}
Source_file *f = new Source_file (file_string);