maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-718: Set locale (for sake of wcwidth()). Warn if locale does not use UTF-8.

Browse Source
This commit is contained in:
Michael Jumper 2014-06-02 16:01:13 -07:00
parent b106e13bb1
commit c84a88d35a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/protocols/ssh/client.c
View File

@ -28,6 +28,8 @@
#include "ssh_client.h" #include "ssh_client.h"
#include "terminal.h" #include "terminal.h"
#include <langinfo.h>
#include <locale.h>
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -130,6 +132,11 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
return -1; return -1;
} }
/* Set locale and warn if not UTF-8 */
setlocale(LC_CTYPE, "");
if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
guac_client_log_info(client, "Current locale does not use UTF-8. Some characters may not render correctly.");
/* Read parameters */ /* Read parameters */
strcpy(client_data->hostname, argv[IDX_HOSTNAME]); strcpy(client_data->hostname, argv[IDX_HOSTNAME]);
strcpy(client_data->username, argv[IDX_USERNAME]); strcpy(client_data->username, argv[IDX_USERNAME]);

7
src/protocols/telnet/client.c
View File

@ -27,6 +27,8 @@
#include "telnet_client.h" #include "telnet_client.h"
#include "terminal.h" #include "terminal.h"
#include <langinfo.h>
#include <locale.h>
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -92,6 +94,11 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
return -1; return -1;
} }
/* Set locale and warn if not UTF-8 */
setlocale(LC_CTYPE, "");
if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
guac_client_log_info(client, "Current locale does not use UTF-8. Some characters may not render correctly.");
/* Read parameters */ /* Read parameters */
strcpy(client_data->hostname, argv[IDX_HOSTNAME]); strcpy(client_data->hostname, argv[IDX_HOSTNAME]);