From 628f39beca35cfdf725fdb4f855272c1166ad656 Mon Sep 17 00:00:00 2001 From: Sterling Augustine Date: Thu, 17 Nov 2011 17:46:54 +0000 Subject: 2011-11-17 Sterling Augustine * script.cc (script_include_directive): Implement. (read_script_file): New local variables name and search_path. Update comment. Call IS_ABSOLUTE_PATH and Dirsearch::find_file_in_dir_list. * dirsearch.h (Dirsearch::find_file_in_dir_list): Declare new method. * dirsearch.cc (Dirsearch::find_file_in_dir_list): Implement it. --- gold/dirsearch.cc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gold/dirsearch.cc') diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc index 1ae2055..a6114a4 100644 --- a/gold/dirsearch.cc +++ b/gold/dirsearch.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "debug.h" @@ -277,4 +278,28 @@ Dirsearch::find(const std::vector& names, return std::string(); } +// Search for a file in a directory list. This is a low-level function and +// therefore can be used before options and parameters are set. + +std::string +Dirsearch::find_file_in_dir_list(const std::string& name, + const General_options::Dir_list& directories, + const std::string& extra_search_dir) +{ + struct stat buf; + std::string extra_name = extra_search_dir + '/' + name; + + if (stat(extra_name.c_str(), &buf) == 0) + return extra_name; + for (General_options::Dir_list::const_iterator dir = directories.begin(); + dir != directories.end(); + ++dir) + { + std::string full_name = dir->name() + '/' + name; + if (stat(full_name.c_str(), &buf) == 0) + return full_name; + } + return name; +} + } // End namespace gold. -- cgit v1.1