[Emacs-diffs] emacs-24 r117629: Fix bug #18873 with non-ASCII characters in user's HOME directory.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117629
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18873
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-10-28 19:48:21 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-26 15:42:08 +0000
+++ b/src/ChangeLog     2014-10-28 17:48:21 +0000
@@ -1,3 +1,8 @@
+2014-10-28  Eli Zaretskii  <address@hidden>
+
+       * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
+       build_string, when importing a home directory.  (Bug#18873)
+
 2014-10-26  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (buffer_posn_from_coords): Use

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2014-09-16 04:07:51 +0000
+++ b/src/fileio.c      2014-10-28 17:48:21 +0000
@@ -1166,7 +1166,7 @@
              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 @@
              /* `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);