Merge branch 'macox_fixes' into build_enhancement

Conflicts:
	test/solidityNatspecJSON.cpp

1 files changed, 15 insertions, 0 deletions

diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp
index d3dd3945..6ace332f 100644
--- a/CommandLineInterface.cpp
+++ b/CommandLineInterface.cpp
@@ -255,7 +255,22 @@ bool CommandLineInterface::processInput()
 	}
 	else
 		for (string const& infile: m_args["input-file"].as<vector<string>>())
+		{
+			auto path = boost::filesystem::path(infile);
+			if (!boost::filesystem::exists(path))
+			{
+				cout << "Skipping non existant input file \"" << infile << "\"" << endl;
+				continue;
+			}
+
+			if (!boost::filesystem::is_regular_file(path))
+			{
+				cout << "\"" << infile << "\" is not a valid file. Skipping" << endl;
+				continue;
+			}
+
 			m_sourceCodes[infile] = asString(dev::contents(infile));
+		}
 
 	try
 	{