From 19a821ee581f0fe60860627472cc59065247bf13 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 8 Jul 2012 23:17:56 +0300
Subject: [PATCH] Make VirtualFileSystem able to find binaries

---
 source/virtualfilesystem.cpp | 37 ++++++++++++++++++++++++++++++++++++
 source/virtualfilesystem.h   |  5 +++++
 2 files changed, 42 insertions(+)

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 0dc8de6..cccc169 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,9 +1,11 @@
+#include <cstdlib>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
 #include "csourcefile.h"
+#include "executable.h"
 #include "misc.h"
 #include "sharedlibrary.h"
 #include "staticlibrary.h"
@@ -129,6 +131,41 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	return 0;
 }
 
+FileTarget *VirtualFileSystem::find_binary(const string &name)
+{
+	SearchPath path;
+	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");
+	}
+
+	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
+	{
+		FS::Path filename = *i/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()));
+			return tgt;
+		}
+		else if(file_exists(filename))
+		{
+			builder.get_logger().log("vfs", format("Binary %s found in %s", name, *i));
+			return new Executable(builder, filename);
+		}
+
+		builder.get_logger().log("vfs", format("Binary %s not found in %s", name, *i));
+	}
+
+	return 0;
+}
+
 bool VirtualFileSystem::file_exists(const FS::Path &filename)
 {
 	if(nonexistent.count(filename))
diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h
index aef6ab0..a2ce05c 100644
--- a/source/virtualfilesystem.h
+++ b/source/virtualfilesystem.h
@@ -47,6 +47,11 @@ public:
 	created. */
 	FileTarget *find_library(const std::string &, const SearchPath &, LibMode);
 
+	/** Locates a binary.  The normal search path for binaries is used (usually
+	this means the PATH environment variable).  If a file is found but no target
+	is associated with it, a new package-less Executable target is created. */
+	FileTarget *find_binary(const std::string &);
+
 private:
 	bool file_exists(const Msp::FS::Path &);
 };
-- 
2.45.2