1 files changed, 130 insertions, 67 deletions
diff --git a/src/util.cc b/src/util.cc
index 76d380b..a4abd23 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -6,12 +6,18 @@
 #include <iostream>
 #include <fstream>
 #include <algorithm>
+#include <sstream>
+#include <cctype>
+#include <cstdlib>
 
-std::string to_lower(const std::string& str)
+std::string to_lower(std::string str)
 {
-	std::string out{str};
-	std::transform(out.begin(), out.end(), out.begin(), ::tolower);
-	return out;
+	std::transform(str.begin(), str.end(), str.begin(),
+	               [](unsigned char c)
+	               {
+		               return std::tolower(c);
+	               });
+	return str;
 }
 
 std::string readFile(const std::string& fileName)
@@ -19,73 +25,17 @@ std::string readFile(const std::string& fileName)
 	std::ifstream ifs(fileName.c_str(),
 	                  std::ios::in | std::ios::binary | std::ios::ate);
 
-	std::ifstream::pos_type fileSize = ifs.tellg();
-	ifs.seekg(0, std::ios::beg);
-
-	std::vector<char> bytes(fileSize);
-	ifs.read(bytes.data(), fileSize);
-
-	return std::string(bytes.data(), fileSize);
-}
-
-std::vector<std::string> readDeps(const std::string& depFile)
-{
-	if(!std::filesystem::exists(depFile))
+	auto size = ifs.tellg();
+	if(size < 0)
 	{
 		return {};
 	}
+	ifs.seekg(0, std::ios::beg);
 
-	auto str = readFile(depFile);
-
-	std::vector<std::string> output;
-	std::string tmp;
-	bool start{false};
-	bool in_whitespace{false};
-	for(const auto& c : str)
-	{
-		if(c == '\\' || c == '\n')
-		{
-			continue;
-		}
-
-		if(c == ':')
-		{
-			start = true;
-			continue;
-		}
-
-		if(!start)
-		{
-			continue;
-		}
-
-		if(c == ' ' || c == '\t')
-		{
-			if(in_whitespace)
-			{
-				continue;
-			}
-
-			if(!tmp.empty())
-			{
-				output.push_back(tmp);
-			}
-			tmp.clear();
-			in_whitespace = true;
-		}
-		else
-		{
-			in_whitespace = false;
-			tmp += c;
-		}
-	}
-
-	if(!tmp.empty())
-	{
-		output.push_back(tmp);
-	}
+	std::string bytes(static_cast<std::size_t>(size), '\0');
+	ifs.read(bytes.data(), static_cast<std::streamsize>(bytes.size()));
 
-	return output;
+	return bytes;
 }
 
 ctor::language languageFromExtension(const std::filesystem::path& file)
@@ -168,8 +118,18 @@ std::string esc(const std::string& in)
 	return out;
 }
 
-std::vector<std::string> get_paths(const std::string& path_env)
+std::vector<std::string> get_paths(const std::string& path_env_)
 {
+	std::string path_env;
+	if(!path_env_.empty())
+	{
+		path_env = path_env_;
+	}
+	else
+	{
+		get_env("PATH", path_env);
+	}
+
 	std::vector<std::string> paths;
 
 #ifdef _WIN32
@@ -244,3 +204,106 @@ std::string locate(const std::string& prog,
 
 	return {};
 }
+
+std::vector<std::string> argsplit(const std::string& str)
+{
+	enum class state
+	{
+		normal,
+		in_quot,
+		in_apotrophe,
+	} state{state::normal};
+	bool esc{false};
+
+	std::string token;
+	std::vector<std::string> tokens;
+	for(auto c : str)
+	{
+		switch(state)
+		{
+		case state::normal:
+			if(esc)
+			{
+				esc = false;
+			}
+			else
+			{
+				if(c == ' ')
+				{
+					tokens.push_back(token);
+					token.clear();
+					continue;
+				}
+				if(c == '\\')
+				{
+					esc = true;
+				}
+				if(c == '"')
+				{
+					state = state::in_quot;
+				}
+				if(c == '\'')
+				{
+					state = state::in_apotrophe;
+				}
+			}
+
+			token += c;
+			break;
+		case state::in_quot:
+			if(esc)
+			{
+				esc = false;
+			}
+			else
+			{
+				if(c == '\\')
+				{
+					esc = true;
+				}
+				if(c == '"')
+				{
+					state = state::normal;
+				}
+			}
+
+			token += c;
+			break;
+		case state::in_apotrophe:
+			if(esc)
+			{
+				esc = false;
+			}
+			else
+			{
+				if(c == '\\')
+				{
+					esc = true;
+				}
+				if(c == '\'')
+				{
+					state = state::normal;
+				}
+			}
+
+			token += c;
+			break;
+		}
+	}
+	if(!token.empty())
+	{
+		tokens.push_back(token);
+	}
+	return tokens;
+}
+
+bool get_env(std::string_view name, std::string& value)
+{
+	auto var = getenv(name.data());
+	if(var)
+	{
+		value = var;
+		return true;
+	}
+	return false;
+}