# HG changeset patch # User Karl Heuer # Date 891899549 0 # Node ID 5f153464fc999ef96631d03eb7763fa8db0f284d # Parent 20bc0bd34ada3af8de7033e7b46717cf91fcd0dc (Fdirectory_files): Use make_uninit_multibyte_string. Use STRING_BYTES on encoded_directory. diff -r 20bc0bd34ada -r 5f153464fc99 src/dired.c --- a/src/dired.c Mon Apr 06 10:33:02 1998 +0000 +++ b/src/dired.c Mon Apr 06 21:52:29 1998 +0000 @@ -183,7 +183,7 @@ report_file_error ("Opening directory", Fcons (directory, Qnil)); list = Qnil; - dirnamelen = XSTRING (encoded_directory)->size; + dirnamelen = STRING_BYTES (XSTRING (encoded_directory)); re_match_object = Qt; /* Decide whether we need to add a directory separator. */ @@ -191,7 +191,7 @@ if (dirnamelen == 0 || !IS_ANY_SEP (XSTRING (encoded_directory)->data[dirnamelen - 1])) needsep = 1; -#endif /* VMS */ +#endif /* not VMS */ GCPRO2 (encoded_directory, list); @@ -214,7 +214,8 @@ int total = len + dirnamelen; int nchars; - name = make_uninit_string (total + needsep); + name = make_uninit_multibyte_string (total + needsep, + total + needsep); bcopy (XSTRING (encoded_directory)->data, XSTRING (name)->data, dirnamelen); if (needsep)