Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Also use LANG env var to check for UTF-8 output support (#15257) ##cons

Browse Source
This commit is contained in:
GustavoLCR 2019-10-16 07:12:26 -03:00 committed by radare
parent 50174972fd
commit 73d555dbed
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libr/cons/utf8.c
View File

@ -191,24 +191,31 @@ static int cursor_position(const int tty, int *const rowptr, int *const colptr)
}
#endif
R_API int r_cons_is_utf8() {
int ret = 0;
R_API bool r_cons_is_utf8() {
bool ret = false;
#if UTF8_DETECT_ENV
char *sval = r_sys_getenv ("LC_CTYPE");
if (sval) {
r_str_case (sval, 0);
if (!strcmp (sval, "utf-8")) {
ret = 1;
ret = true;
}
free (sval);
}
char *lang = r_sys_getenv ("LANG");
if (lang) {
if (strstr (lang, "UTF-8")) {
ret = true;
}
free (lang);
}
#endif
#if UTF8_DETECT_LOCALE
#include <locale.h>
const char *ctype = setlocale(LC_CTYPE, NULL);
if ( (ctype != NULL) && (ctype = strchr(ctype, '.')) && ctype++ &&
(r_str_casecmp(ctype, "UTF-8") == 0 || r_str_casecmp(ctype, "UTF8") == 0)) {
return 1;
return true;
}
#endif
#if UTF8_DETECT_CURSOR
@ -216,15 +223,15 @@ R_API int r_cons_is_utf8() {
int row2 = 0, col2 = 0;
int fd = current_tty();
if (fd == -1)
return 0;
return false;
if (cursor_position(fd, &row, &col)) {
close (fd);
return 0;
return false;
}
write (1, "\xc3\x89\xc3\xa9", 4);
if (cursor_position (fd, &row2, &col2)) {
close (fd);
return 0;
return false;
}
close (fd);
write (1, "\r \r", 6);
@ -233,11 +240,11 @@ R_API int r_cons_is_utf8() {
return ret;
}
#else
R_API int r_cons_is_utf8() {
R_API bool r_cons_is_utf8() {
#if __WINDOWS__
return GetConsoleOutputCP () == CP_UTF8;
#else
return 0;
return true;
#endif
}
#endif

2
libr/include/r_cons.h
View File

@ -885,7 +885,7 @@ R_API void r_cons_2048(bool color);
R_API void r_cons_memset(char ch, int len);
R_API void r_cons_visual_flush(void);
R_API void r_cons_visual_write(char *buffer);
R_API int r_cons_is_utf8(void);
R_API bool r_cons_is_utf8(void);
R_API void r_cons_cmd_help(const char * help[], bool use_color);
R_API void r_cons_log_stub(const char *output, const char *funcname, const char *filename,
unsigned int lineno, unsigned int level, const char *tag, const char *fmtstr, ...);