blob: 4cac6582cfbb07bce3085e077da74d754ff3e10c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff -upr mosh-1.3.0.orig/src/tests/e2e-test-subrs mosh-1.3.0/src/tests/e2e-test-subrs
--- mosh-1.3.0.orig/src/tests/e2e-test-subrs 2017-04-02 13:48:55.002568475 +0200
+++ mosh-1.3.0/src/tests/e2e-test-subrs 2017-04-02 13:50:03.839053154 +0200
@@ -59,19 +59,5 @@ chr()
# or C.UTF-8.
set_locale()
{
- # Test for a usable locale.
- map=$(locale charmap 2>/dev/null)
- if [ "$map" = "utf-8" ] || [ "$map" = "UTF-8" ]; then
- return 0
- fi
- # Attempt to find/set a usable locale.
- for i in en_US.UTF-8 en_US.utf8 C.UTF-8; do
- map="$(env LANG=$i locale charmap 2>/dev/null)"
- if [ "$map" = "utf-8" ] || [ "$map" = "UTF-8" ]; then
- export LANG=$i LC_ALL=''
- return 0
- fi
- done
- # Fail.
- return 1
+ return 0
}
diff -upr mosh-1.3.0.orig/src/util/locale_utils.cc mosh-1.3.0/src/util/locale_utils.cc
--- mosh-1.3.0.orig/src/util/locale_utils.cc 2017-04-02 13:48:54.989235240 +0200
+++ mosh-1.3.0/src/util/locale_utils.cc 2017-04-02 13:49:26.675805170 +0200
@@ -85,11 +85,6 @@ const char *locale_charset( void )
}
bool is_utf8_locale( void ) {
- /* Verify locale calls for UTF-8 */
- if ( strcmp( locale_charset(), "UTF-8" ) != 0 &&
- strcmp( locale_charset(), "utf-8" ) != 0 ) {
- return 0;
- }
return 1;
}
|
