comparison src/dired.c @ 21393:5f153464fc99

(Fdirectory_files): Use make_uninit_multibyte_string. Use STRING_BYTES on encoded_directory.

21392:20bc0bd34ada

  d = opendir (XSTRING (dirfilename)->data);
  if (! d)
    report_file_error ("Opening directory", Fcons (directory, Qnil));

  list = Qnil;
  dirnamelen = XSTRING (encoded_directory)->size;
  re_match_object = Qt;

  /* Decide whether we need to add a directory separator.  */
#ifndef VMS
  if (dirnamelen == 0
      || !IS_ANY_SEP (XSTRING (encoded_directory)->data[dirnamelen - 1]))
    needsep = 1;
#endif /* VMS */

  GCPRO2 (encoded_directory, list);

  /* Loop reading blocks */
  while (1)

		{
		  int afterdirindex = dirnamelen;
		  int total = len + dirnamelen;
		  int nchars;

		  name = make_uninit_string (total + needsep);
		  bcopy (XSTRING (encoded_directory)->data, XSTRING (name)->data,
			 dirnamelen);
		  if (needsep)
		    XSTRING (name)->data[afterdirindex++] = DIRECTORY_SEP;
		  bcopy (dp->d_name,

21393:5f153464fc99

  d = opendir (XSTRING (dirfilename)->data);
  if (! d)
    report_file_error ("Opening directory", Fcons (directory, Qnil));

  list = Qnil;
  dirnamelen = STRING_BYTES (XSTRING (encoded_directory));
  re_match_object = Qt;

  /* Decide whether we need to add a directory separator.  */
#ifndef VMS
  if (dirnamelen == 0
      || !IS_ANY_SEP (XSTRING (encoded_directory)->data[dirnamelen - 1]))
    needsep = 1;
#endif /* not VMS */

  GCPRO2 (encoded_directory, list);

  /* Loop reading blocks */
  while (1)

		{
		  int afterdirindex = dirnamelen;
		  int total = len + dirnamelen;
		  int nchars;

		  name = make_uninit_multibyte_string (total + needsep,
						       total + needsep);
		  bcopy (XSTRING (encoded_directory)->data, XSTRING (name)->data,
			 dirnamelen);
		  if (needsep)
		    XSTRING (name)->data[afterdirindex++] = DIRECTORY_SEP;
		  bcopy (dp->d_name,