(directory_files_internal): Convert result from readdir

to a unibyte string initially, to avoid possible misinterpretation
of some bytes as the internal form of Emacs characters.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b24e335fe086a9c9952258303cbcbf9e51aafaa..ae091659f49eba4e0e2462d5f4eca0d0e7ae6d2e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-17  Andrew Innes  <andrewi@gnu.org>
+
+       * dired.c (directory_files_internal): Convert result from readdir
+       to a unibyte string initially, to avoid possible misinterpretation
+       of some bytes as the internal form of Emacs characters.
+
 2001-01-17  Kenichi Handa  <handa@etl.go.jp>
 
        * fns.c (concat): Be sure to avoid putting the same `composition'

diff --git a/src/dired.c b/src/dired.c
index 04b14f6c4a53622ee1df6c65e6a86476bf6753d7..4994241c2cf68ad4f259af0b8dc7500c705cf6cb 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -218,7 +218,7 @@ directory_files_internal (directory, full, match, nosort, attrs)
          struct gcpro gcpro1, gcpro2;
 
          len = NAMLEN (dp);
-         name = finalname = make_string (dp->d_name, len);
+         name = finalname = make_unibyte_string (dp->d_name, len);
          GCPRO2 (finalname, name);
          
          /* Note: ENCODE_FILE can GC; it should protect its argument,