Replace basic for loops with range-based loops or algorithms

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index b5142266edf639203755f1733598df20abc9cf8b..935600de085f6409a157a0303e68b7f39c168da1 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,4 +1,4 @@
-#include <cstdlib>
+#include <msp/core/environ.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
@@ -51,21 +51,21 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
 
-       for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+       for(const FS::Path &p: combined_path)
        {
-               FS::Path filename = *i/name;
+               FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, i->str(), tgt->get_type()));
+                       builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, p.str(), tgt->get_type()));
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s", name, i->str()));
+                       builder.get_logger().log("vfs", format("Header %s found in %s", name, p.str()));
                        return dynamic_cast<FileTarget *>(tool->create_source(filename));
                }
 
-               builder.get_logger().log("vfs", format("Header %s not found in %s", name, i->str()));
+               builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
        }
 
        return 0;
@@ -85,33 +85,35 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
        const Architecture &arch = builder.get_current_arch();
 
        list<string> shared_names;
+       bool use_import_lib = false;
        if(mode!=BuildInfo::FORCE_STATIC)
-               shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+       {
+               shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+               if(!(use_import_lib = !shared_names.empty()))
+                       shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+       }
 
        list<string> static_names;
        if(mode!=BuildInfo::FORCE_DYNAMIC)
                static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
-       for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+       for(const FS::Path &p: combined_path)
        {
                const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
-               for(list<string>::const_iterator j=cur_names->begin(); j!=cur_names->end(); )
+               for(auto j=cur_names->begin(); j!=cur_names->end(); )
                {
-                       FS::Path filename = *i / *j;
+                       FS::Path filename = p / *j;
                        if(FileTarget *tgt = get_target(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
+                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type()));
                                return tgt;
                        }
                        else if(file_exists(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
+                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str()));
                                if(cur_names==&shared_names)
                                {
-                                       /* XXX Hack: create ImportLibraries here; they should be handled
-                                       separately, but I need a more generic way of handling all these
-                                       filename patterns */
-                                       if(FS::extpart(*j)==".a")
+                                       if(use_import_lib)
                                                return new ImportLibrary(builder, filename);
                                        return new SharedLibrary(builder, filename);
                                }
@@ -131,7 +133,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        }
                }
 
-               builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
+               builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
        }
 
        return 0;
@@ -142,33 +144,36 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
        SearchPath path;
        if(FS::Path(name).is_absolute())
                path.push_back("/");
-       else if(const char *env_path = getenv("PATH"))
-       {
-               vector<string> parts = split(env_path, ':');
-               for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-                       path.push_back(*i);
-       }
        else
        {
-               path.push_back("/bin");
-               path.push_back("/usr/bin");
+               string env_path = Msp::getenv("PATH");
+               if(!env_path.empty())
+               {
+                       for(const string &p: split(env_path, ':'))
+                               path.push_back(p);
+               }
+               else
+               {
+                       path.push_back("/bin");
+                       path.push_back("/usr/bin");
+               }
        }
 
-       for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
+       for(const FS::Path &p: path)
        {
-               FS::Path filename = *i/name;
+               FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, *i, tgt->get_type()));
+                       builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, p, tgt->get_type()));
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s", name, *i));
+                       builder.get_logger().log("vfs", format("Binary %s found in %s", name, p));
                        return new Executable(builder, filename);
                }
 
-               builder.get_logger().log("vfs", format("Binary %s not found in %s", name, *i));
+               builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p));
        }
 
        return 0;