From 06be6983bb907e61d30fa4c8ec1b434bbfee9e45 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 2 Dec 2009 11:16:42 +0000 Subject: [PATCH] 2009-10-23 Tristan Gingold * charset.c (_initialize_charset): Set a default value to auto_host_charset_name if empty. --- gdb/ChangeLog | 5 +++++ gdb/charset.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 613db80..d8f6b52 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-12-01 Tristan Gingold + + * charset.c (_initialize_charset): Set a default value to + auto_host_charset_name if empty. + 2009-12-01 Joseph Myers * gcore.c: Include solib.h. diff --git a/gdb/charset.c b/gdb/charset.c index f5281ed..4bc8894 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -818,8 +818,9 @@ _initialize_charset (void) #ifdef HAVE_LANGINFO_CODESET auto_host_charset_name = nl_langinfo (CODESET); /* Solaris will return `646' here -- but the Solaris iconv then - does not accept this. */ - if (!strcmp (auto_host_charset_name, "646")) + does not accept this. Darwin (and maybe FreeBSD) may return "" here, + which GNU libiconv doesn't like (infinite loop). */ + if (!strcmp (auto_host_charset_name, "646") || !*auto_host_charset_name) auto_host_charset_name = "ASCII"; target_charset_name = auto_host_charset_name; -- 2.7.4