Fix bug #18873 with non-ASCII characters in user's HOME directory.

 src/fileio.c (Fexpand_file_name): Use make_unibyte_string, not
 build_string, when importing a home directory.

diff --git a/src/ChangeLog b/src/ChangeLog
index da3e4d682d557318a1fdf8c2983dd1931e4e4296..33ee723fe66106b07bf10bb319522b401d6a8b7c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+       * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
+       build_string, when importing a home directory.  (Bug#18873)
+
 2014-10-26  Eli Zaretskii  <eliz@gnu.org>
 
        * dispnew.c (buffer_posn_from_coords): Use

diff --git a/src/fileio.c b/src/fileio.c
index b4653017b282fbba1b22f0f4aedb355cdd7a71e9..fba64010b54b58a11f89b6f36322e8e915c07ed6 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1166,7 +1166,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
              char newdir_utf8[MAX_UTF8_PATH];
 
              filename_from_ansi (newdir, newdir_utf8);
-             tem = build_string (newdir_utf8);
+             tem = make_unibyte_string (newdir_utf8, strlen (newdir_utf8));
            }
          else
 #endif
@@ -1200,7 +1200,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
              /* `getpwnam' may return a unibyte string, which will
                 bite us since we expect the directory to be
                 multibyte.  */
-             tem = build_string (newdir);
+             tem = make_unibyte_string (newdir, strlen (newdir));
              if (multibyte && !STRING_MULTIBYTE (tem))
                {
                  hdir = DECODE_FILE (tem);