From 1b9147d7db08a94dd00532bc611ac322c8ed3e57 Mon Sep 17 00:00:00 2001
From: Christopher Gilbert <christopher.john.gilbert@gmail.com>
Date: Tue, 30 Aug 2016 12:29:37 +0100
Subject: Fixed a bug causing solc to crash on startup due to invalid
 environment settings for locale

---
 solc/main.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'solc')

diff --git a/solc/main.cpp b/solc/main.cpp
index eaada1c4..bc8bdc81 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -21,13 +21,24 @@
  */
 
 #include "CommandLineInterface.h"
+#include <clocale>
 #include <iostream>
 #include <boost/exception/all.hpp>
 
 using namespace std;
 
+void setEnv() {
+	std::setlocale(LC_ALL, "C");
+#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+	if (!std::setlocale(LC_ALL, "")) {
+		setenv("LC_ALL", "C", 1);
+	}
+#endif
+}
+
 int main(int argc, char** argv)
 {
+	setEnv();
 	dev::solidity::CommandLineInterface cli;
 	if (!cli.parseArguments(argc, argv))
 		return 1;
-- 
cgit v1.2.3


From a91bca7937e7f6ffdc84c998eade6d38fb08cbb9 Mon Sep 17 00:00:00 2001
From: Christopher Gilbert <christopher.john.gilbert@gmail.com>
Date: Tue, 30 Aug 2016 16:13:21 +0100
Subject: Code review changes: stylistic changes, and removed redundant call to
 set locale.

---
 solc/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'solc')

diff --git a/solc/main.cpp b/solc/main.cpp
index bc8bdc81..ce787574 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -27,10 +27,11 @@
 
 using namespace std;
 
-void setEnv() {
-	std::setlocale(LC_ALL, "C");
+void setEnv()
+{
 #if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
-	if (!std::setlocale(LC_ALL, "")) {
+	if (!std::setlocale(LC_ALL, ""))
+	{
 		setenv("LC_ALL", "C", 1);
 	}
 #endif
-- 
cgit v1.2.3


From 68bd463bea5d5a17b90e76ee7f1bff0593775ca8 Mon Sep 17 00:00:00 2001
From: Christopher Gilbert <christopher.john.gilbert@gmail.com>
Date: Tue, 30 Aug 2016 20:32:30 +0100
Subject: Code review changes: Renamed function and added some documentation
 about what the function does and why

---
 solc/main.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'solc')

diff --git a/solc/main.cpp b/solc/main.cpp
index ce787574..11facfa6 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -27,9 +27,22 @@
 
 using namespace std;
 
-void setEnv()
+/*
+The equivalent of setlocale(LC_ALL, “C”) is called before any user code is run.
+If the user has an invalid environment setting then it is possible for the call
+to set locale to fail, so there are only two possible actions, the first is to
+throw a runtime exception and cause the program to quit (default behaviour),
+or the second is to modify the environment to something sensible (least
+surprising behaviour).
+
+The follow code produces the least surprising behaviour. It will use the user
+specified default locale if it is valid, and if not then it will modify the
+environment the process is running in to use a sensible default. This also means
+that users do not need to install language packs for their OS.
+*/
+void setDefaultOrCLocale()
 {
-#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if __unix__
 	if (!std::setlocale(LC_ALL, ""))
 	{
 		setenv("LC_ALL", "C", 1);
@@ -39,7 +52,7 @@ void setEnv()
 
 int main(int argc, char** argv)
 {
-	setEnv();
+	setDefaultOrCLocale();
 	dev::solidity::CommandLineInterface cli;
 	if (!cli.parseArguments(argc, argv))
 		return 1;
-- 
cgit v1.2.3