comparison src/fileio.c @ 15313:0fad77a676b7

(Fexpand_file_name) [WINDOWSNT]: Don't strip trailing / when newdir is just "//". (Ffile_name_directory) [WINDOWSNT]: Return Qnil if filename is a partial UNC name such as "//foo".

15312:d425f28aff41

#endif
	 ) p--;

  if (p == beg)
    return Qnil;
#ifdef DOS_NT
  /* Expansion of "c:" to drive and default directory.  */
  if (p == beg + 2 && beg[1] == ':')
    {
      /* MAXPATHLEN+1 is guaranteed to be enough space for getdefdir.  */

    }
#endif /* DOS_NT */

  if (newdir)
    {
      /* Get rid of any slash at the end of newdir.  */
      length = strlen (newdir);
      if (IS_DIRECTORY_SEP (newdir[length - 1]))
	{
	  unsigned char *temp = (unsigned char *) alloca (length);
	  bcopy (newdir, temp, length - 1);
	  temp[length - 1] = 0;
	  newdir = temp;

15313:0fad77a676b7

#endif
	 ) p--;

  if (p == beg)
    return Qnil;
#ifdef WINDOWSNT
  /* We can consider the partial UNC name //machine to be a
     directory name, but not just // on its own. */
  if (p == beg + 1 && IS_DIRECTORY_SEP (p[-1]))
    return Qnil;
#endif
#ifdef DOS_NT
  /* Expansion of "c:" to drive and default directory.  */
  if (p == beg + 2 && beg[1] == ':')
    {
      /* MAXPATHLEN+1 is guaranteed to be enough space for getdefdir.  */

    }
#endif /* DOS_NT */

  if (newdir)
    {
      /* Get rid of any slash at the end of newdir, unless newdir is
       just // (an incomplete UNC name). */
      length = strlen (newdir);
      if (IS_DIRECTORY_SEP (newdir[length - 1])
#ifdef WINDOWSNT
	  && !(length == 2 && IS_DIRECTORY_SEP (newdir[0]))
#endif
	  )
	{
	  unsigned char *temp = (unsigned char *) alloca (length);
	  bcopy (newdir, temp, length - 1);
	  temp[length - 1] = 0;
	  newdir = temp;