From 9d1fd2266abb48320bdc6a49e0ae2bab40793a57 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Fri, 6 Feb 2015 10:17:27 -0700
Subject: [PATCH] Encoding: Only call setlocale() where required.

libarchive requires setlocale() to handle non-ascii filenames,
so we do setlocale() around libarchive calls.
---
 Source/CPack/cpack.cxx                         |  1 -
 Source/CursesDialog/ccmake.cxx                 |  2 --
 Source/cmArchiveWrite.cxx                      | 15 +++++++++++++++
 Source/cmakemain.cxx                           |  1 -
 Source/ctest.cxx                               |  2 --
 Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in |  1 -
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 00bfe5b..31f75f5 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -101,7 +101,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
 // this is CPack.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 28f3d9b..66085c9 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -95,8 +95,6 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
 
 int main(int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
-
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index c24c68e..6b9c675 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,19 @@
 #include <cm_libarchive.h>
 #include "cm_get_date.h"
 
+struct cmArchiveSetLocale
+{
+  cmArchiveSetLocale()
+  {
+    OldLocale = setlocale(LC_CTYPE, "");
+  }
+  ~cmArchiveSetLocale()
+  {
+    setlocale(LC_CTYPE, OldLocale);
+  }
+  const char* OldLocale;
+};
+
 //----------------------------------------------------------------------------
 static std::string cm_archive_error_string(struct archive* a)
 {
@@ -260,6 +273,8 @@ bool cmArchiveWrite::AddFile(const char* file,
     }
   const char* out = file + skip;
 
+  cmArchiveSetLocale setloc;
+
   // Meta-data.
   std::string dest = prefix? prefix : "";
   dest += out;
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 6d25b70..32b6447 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -173,7 +173,6 @@ static void cmakemainProgressCallback(const char *m, float prog,
 
 int main(int ac, char const* const* av)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index b77c231..928f1f9 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -117,8 +117,6 @@ static const char * cmDocumentationOptions[][2] =
 // this is a test driver program for cmCTest.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
-
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();
diff --git a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
index 43c0ba7..bedde09 100644
--- a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
+++ b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
@@ -8,7 +8,6 @@
 int
 main(int ac, char **av)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   int argc = args.argc();
-- 
1.9.3