diff options
| author | Andrew Innes | 2001-01-17 11:11:53 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-01-17 11:11:53 +0000 |
| commit | 9ad4f3e55659c2833d86e48d8ba0362b927ece52 (patch) | |
| tree | fdf7c0b7074334c643f0dd788f55528202f8dccf /src | |
| parent | 3bd00f3b932b8813b599f70abd3f70150262410f (diff) | |
| download | emacs-9ad4f3e55659c2833d86e48d8ba0362b927ece52.tar.gz emacs-9ad4f3e55659c2833d86e48d8ba0362b927ece52.zip | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dired.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8b24e335fe0..ae091659f49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2001-01-17 Andrew Innes <andrewi@gnu.org> | ||
| 2 | |||
| 3 | * dired.c (directory_files_internal): Convert result from readdir | ||
| 4 | to a unibyte string initially, to avoid possible misinterpretation | ||
| 5 | of some bytes as the internal form of Emacs characters. | ||
| 6 | |||
| 1 | 2001-01-17 Kenichi Handa <handa@etl.go.jp> | 7 | 2001-01-17 Kenichi Handa <handa@etl.go.jp> |
| 2 | 8 | ||
| 3 | * fns.c (concat): Be sure to avoid putting the same `composition' | 9 | * fns.c (concat): Be sure to avoid putting the same `composition' |
diff --git a/src/dired.c b/src/dired.c index 04b14f6c4a5..4994241c2cf 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -218,7 +218,7 @@ directory_files_internal (directory, full, match, nosort, attrs) | |||
| 218 | struct gcpro gcpro1, gcpro2; | 218 | struct gcpro gcpro1, gcpro2; |
| 219 | 219 | ||
| 220 | len = NAMLEN (dp); | 220 | len = NAMLEN (dp); |
| 221 | name = finalname = make_string (dp->d_name, len); | 221 | name = finalname = make_unibyte_string (dp->d_name, len); |
| 222 | GCPRO2 (finalname, name); | 222 | GCPRO2 (finalname, name); |
| 223 | 223 | ||
| 224 | /* Note: ENCODE_FILE can GC; it should protect its argument, | 224 | /* Note: ENCODE_FILE can GC; it should protect its argument, |