Move some locale handling into one place

src/examples/Makefile.am

@@ -34,7 +34,7 @@ ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ..
 
 benchmark_SOURCES = benchmark.cc
 benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto $(BOOST_CPPFLAGS) -I$(srcdir)/../network
-benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
+benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
 if COND_THIRD_LIBSTDDJB
   benchmark_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
   benchmark_LDADD += $(top_builddir)/third/libstddjb/libstddjb.a

src/examples/benchmark.cc

@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <locale.h>
 #include <string.h>
-#include <langinfo.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,6 +46,7 @@ extern "C" {
 #include "completeterminal.h"
 #include "user.h"
 #include "terminaloverlay.h"
+#include "locale_utils.h"
 
 const int ITERATIONS = 100000;
 
@@ -63,16 +63,8 @@ int main( void )
   Complete local_terminal( 80, 24 );
 
   /* Adopt native locale */
-  if ( NULL == setlocale( LC_ALL, "" ) ) {
+  set_native_locale();
-    perror( "setlocale" );
+  assert_utf8_locale();
-    exit( 1 );
-  }
-
-  /* Verify locale calls for UTF-8 */
-  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
-    exit( 1 );
-  }
 
   for ( int i = 0; i < ITERATIONS; i++ ) {
     /* type a character */

src/examples/parse.cc

@@ -26,7 +26,6 @@
 #include <poll.h>
 #include <string.h>
 #include <locale.h>
-#include <langinfo.h>
 #include <wchar.h>
 #include <assert.h>
 #include <wctype.h>
@@ -41,6 +40,7 @@
 
 #include "parser.h"
 #include "swrite.h"
+#include "locale_utils.h"
 
 const size_t buf_size = 1024;
 
@@ -55,15 +55,8 @@ int main( int argc __attribute__((unused)),
   int master;
   struct termios saved_termios, raw_termios, child_termios;
 
-  if ( NULL == setlocale( LC_ALL, "" ) ) {
+  set_native_locale();
-    perror( "setlocale" );
+  assert_utf8_locale();
-    exit( 1 );
-  }
-
-  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "stm requires a UTF-8 locale.\n" );
-    exit( 1 );
-  }
 
   if ( tcgetattr( STDIN_FILENO, &saved_termios ) < 0 ) {
     perror( "tcgetattr" );

src/examples/termemu.cc

@@ -26,7 +26,6 @@
 #include <poll.h>
 #include <string.h>
 #include <locale.h>
-#include <langinfo.h>
 #include <wchar.h>
 #include <assert.h>
 #include <wctype.h>
@@ -50,6 +49,7 @@
 #include "completeterminal.h"
 #include "swrite.h"
 #include "fatal_assert.h"
+#include "locale_utils.h"
 
 extern "C" {
 #include "selfpipe.h"
@@ -64,15 +64,8 @@ int main( void )
   int master;
   struct termios saved_termios, raw_termios, child_termios;
 
-  if ( NULL == setlocale( LC_ALL, "" ) ) {
+  set_native_locale();
-    perror( "setlocale" );
+  assert_utf8_locale();
-    exit( 1 );
-  }
-
-  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "stm requires a UTF-8 locale.\n" );
-    exit( 1 );
-  }
 
   if ( tcgetattr( STDIN_FILENO, &saved_termios ) < 0 ) {
     perror( "tcgetattr" );

src/frontend/mosh-client.cc

@@ -24,6 +24,7 @@
 
 #include "stmclient.h"
 #include "crypto.h"
+#include "locale_utils.h"
 
 /* these need to be included last because of conflicting defines */
 #include <curses.h>
@@ -106,10 +107,7 @@ int main( int argc, char *argv[] )
   }
 
   /* Adopt native locale */
-  if ( NULL == setlocale( LC_ALL, "" ) ) {
+  set_native_locale();
-    perror( "setlocale" );
-    exit( 1 );
-  }
 
   try {
     STMClient client( ip, port, key, predict_mode );

src/frontend/mosh-server.cc

@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <locale.h>
 #include <string.h>
-#include <langinfo.h>
 #include <termios.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -49,6 +48,7 @@ extern "C" {
 #include "swrite.h"
 #include "user.h"
 #include "fatal_assert.h"
+#include "locale_utils.h"
 
 #if HAVE_PTY_H
 #include <pty.h>
@@ -196,16 +196,8 @@ int main( int argc, char *argv[] )
   }
 
   /* Adopt implementation locale */
-  if ( NULL == setlocale( LC_ALL, "" ) ) {
+  set_native_locale();
-    perror( "setlocale" );
+  assert_utf8_locale();
-    exit( 1 );
-  }
-
-  /* Verify locale calls for UTF-8 */
-  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
-    exit( 1 );
-  }
 
   try {
     return run_server( desired_ip, desired_port, command, colors );

src/frontend/stmclient.cc

@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <locale.h>
 #include <string.h>
-#include <langinfo.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,16 +46,13 @@ extern "C" {
 #include "completeterminal.h"
 #include "user.h"
 #include "fatal_assert.h"
+#include "locale_utils.h"
 
 #include "networktransport.cc"
 
 void STMClient::init( void )
 {
-  /* Verify locale calls for UTF-8 */
+  assert_utf8_locale();
-  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
-    fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
-    exit( 1 );
-  }
 
   /* Verify terminal configuration */
   if ( tcgetattr( STDIN_FILENO, &saved_termios ) < 0 ) {

src/terminal/parser.cc

@@ -18,8 +18,8 @@
 
 #include <assert.h>
 #include <typeinfo>
-#include <langinfo.h>
 #include <errno.h>
+#include <wchar.h>
 
 #include "parser.h"
 

src/util/Makefile.am

@@ -2,4 +2,4 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshutil.a
 
-libmoshutil_a_SOURCES = swrite.cc swrite.h dos_assert.h fatal_assert.h
+libmoshutil_a_SOURCES = locale_utils.cc locale_utils.h swrite.cc swrite.h dos_assert.h fatal_assert.h

src/util/locale_utils.cc

@@ -0,0 +1,46 @@
+/*
+    Mosh: the mobile shell
+    Copyright 2012 Keith Winstein
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
+#include "locale_utils.h"
+
+void assert_utf8_locale( void ) {
+  /* Verify locale calls for UTF-8 */
+  if ( strcmp( nl_langinfo( CODESET ), "UTF-8" ) != 0 ) {
+    fprintf( stderr, "mosh requires a UTF-8 locale.\n" );
+    exit( 1 );
+  }
+}
+
+void set_native_locale( void ) {
+  /* Adopt native locale */
+  if ( NULL == setlocale( LC_ALL, "" ) ) {
+    perror( "setlocale" );
+    exit( 1 );
+  }
+}

src/util/locale_utils.h

@@ -0,0 +1,25 @@
+/*
+    Mosh: the mobile shell
+    Copyright 2012 Keith Winstein
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef LOCALE_UTILS_HPP
+#define LOCALE_UTILS_HPP
+
+void assert_utf8_locale( void );
+void set_native_locale( void );
+
+#endif