From: Slava Barinov <v.barinov@samsung.com>
Date: Wed, 15 Apr 2020 11:42:37 +0000 (+0300)
Subject: Enable UTF-8 by default
X-Git-Tag: submit/tizen_base/20200416.121222~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4db44a70f3b0fd0a10ff03e831c056ce807aa6c0;p=platform%2Fupstream%2Fguile.git

Enable UTF-8 by default

Default build environment is set for UTF-8, so support is required to
enable build of dependent packages (e.g. autogen)

Change-Id: I0bca17bf0caa44f86f465184e47f7267d5ef266a
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
---

diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 0ac5ea6a6..105e5949b 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness)
   if (scm_i_is_narrow_string (str))                                     \
     {                                                                   \
       err = mem_iconveh (scm_i_string_chars (str), c_strlen,            \
-                         "ISO-8859-1", c_utf_name,                      \
+                         "UTF-8", c_utf_name,                           \
                          iconveh_question_mark, NULL,                   \
                          &c_utf, &c_utf_len);                           \
       if (SCM_UNLIKELY (err))                                           \
diff --git a/libguile/ports.c b/libguile/ports.c
index 45e62f4e4..ececf523d 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -959,7 +959,7 @@ encoding_matches (const char *enc, SCM upper_symbol)
   const char *upper = scm_i_symbol_chars (upper_symbol);
 
   if (!enc)
-    enc = "ISO-8859-1";
+    enc = "UTF-8";
 
   while (*enc)
     if (ascii_toupper (*enc++) != *upper++)
diff --git a/libguile/posix.c b/libguile/posix.c
index a40ddb978..6c963d804 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1832,7 +1832,7 @@ SCM_DEFINE (scm_setlocale, "setlocale", 1, 1, 0,
       SCM_SYSERROR;
     }
 
-  enc = locale_charset ();
+  enc = "UTF-8";
 
   /* Set the default encoding for new ports.  */
   scm_i_set_default_port_encoding (enc);
diff --git a/libguile/strings.c b/libguile/strings.c
index 056b4c99f..293dc3d2e 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void)
 SCM
 scm_from_locale_stringn (const char *str, size_t len)
 {
-  return scm_from_stringn (str, len, locale_charset (),
+  return scm_from_stringn (str, len, "UTF-8",
                            scm_i_default_string_failed_conversion_handler ());
 }
 
@@ -1907,7 +1907,7 @@ char *
 scm_to_locale_stringn (SCM str, size_t *lenp)
 {
   return scm_to_stringn (str, lenp,
-                         locale_charset (),
+                         "UTF-8",
                          scm_i_default_string_failed_conversion_handler ());
 }
 
@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding,
     scm_wrong_type_arg_msg (NULL, 0, str, "string");
 
   if (encoding == NULL)
-    encoding = "ISO-8859-1";
+    encoding = "UTF-8";
 
   if (c_strcasecmp (encoding, "UTF-8") == 0)
     /* This is the most common case--e.g., when calling libc bindings
@@ -2220,8 +2220,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding,
                         "string contains #\\nul character: ~S",
                         scm_list_1 (str));
 
-  if (scm_i_is_narrow_string (str)
-      && c_strcasecmp (encoding, "ISO-8859-1") == 0)
+  if (scm_i_is_narrow_string (str))
     {
       /* If using native Latin-1 encoding, just copy the string
          contents.  */
@@ -2247,7 +2246,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding,
   if (scm_i_is_narrow_string (str))
     {
       ret = mem_iconveh (scm_i_string_chars (str), ilen,
-                         "ISO-8859-1", encoding,
+                         "UTF-8", encoding,
                          (enum iconv_ilseq_handler) handler, NULL,
                          &buf, &len);