v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	tmux.c
This commit is contained in:
Thomas Adam 2016-03-05 17:58:12 +00:00
commit 5fc5c03dad
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tmux.c
View File

@ -23,6 +23,8 @@
#include <errno.h> #include <errno.h>
#include <event.h> #include <event.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <pwd.h> #include <pwd.h>
#include <stdlib.h> #include <stdlib.h>
@ -190,10 +192,14 @@ main(int argc, char **argv)
const char *s; const char *s;
int opt, flags, keys; int opt, flags, keys;
if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
setlocale(LC_CTYPE, ""); if (setlocale(LC_CTYPE, "") == NULL)
if (wcwidth(0xfffd) != 1) errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
errx(1, "no UTF-8 locale; please set LC_CTYPE"); s = nl_langinfo(CODESET);
if (strcasecmp(s, "UTF-8") != 0 &&
strcasecmp(s, "UTF8") != 0)
errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
}
setlocale(LC_TIME, ""); setlocale(LC_TIME, "");
tzset(); tzset();