comparison src/fileio.c @ 8185:b5cc015a3698

(Ffile_name_directory, Ffile_name_nondirectory, file_name_as_directory, directory_file_name, Fexpand_file_name, Ffile_name_absolute_p, Fsubstitute_in_file_name) [MSDOS]: Allow backslashed file names.

8184:8ccef13ebe58

  while (p != beg && p[-1] != '/'
#ifdef VMS
	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
#endif /* VMS */
#ifdef MSDOS
	 && p[-1] != ':'
#endif
	 ) p--;

  if (p == beg)
    return Qnil;

  while (p != beg && p[-1] != '/'
#ifdef VMS
	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
#endif /* VMS */
#ifdef MSDOS
	 && p[-1] != ':'
#endif
	 ) p--;

  return make_string (p, end - p);
}

      out[size] = '\0';
    }
#else /* not VMS */
  /* For Unix syntax, Append a slash if necessary */
#ifdef MSDOS
  if (out[size] != ':' && out[size] != '/')
#else
  if (out[size] != '/')
#endif
    strcat (out, "/");
#endif /* not VMS */

#endif /* VMS */
  /* Process as Unix format: just remove any final slash.
     But leave "/" unchanged; do not change it to "".  */
  strcpy (dst, src);
  if (slen > 1 
      && dst[slen - 1] == '/'
#ifdef MSDOS
      && dst[slen - 2] != ':'
#endif
      )
    dst[slen - 1] = 0;
  return 1;
}

#endif

  nm = XSTRING (name)->data;
  
#ifdef MSDOS
  /* firstly, strip drive name. */
  {
    unsigned char *colon = rindex (nm, ':');
    if (colon)
      if (nm == colon)
	nm++;

  unsigned char *xnm;

  CHECK_STRING (string, 0);

  nm = XSTRING (string)->data;
  endp = nm + XSTRING (string)->size;

  /* If /~ or // appears, discard everything through first slash. */

  for (p = nm; p != endp; p++)

      || index (ptr, ':') || index (ptr, '<')
      || (*ptr == '[' && (ptr[1] != '-' || (ptr[2] != '.' && ptr[2] != ']'))
	  && ptr[1] != '.')
#endif /* VMS */
#ifdef MSDOS
      || (*ptr != 0 && ptr[1] == ':' && ptr[2] == '/')
#endif
      )
    return Qt;
  else
    return Qnil;

8185:b5cc015a3698

  while (p != beg && p[-1] != '/'
#ifdef VMS
	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
#endif /* VMS */
#ifdef MSDOS
	 && p[-1] != ':' && p[-1] != '\\'
#endif
	 ) p--;

  if (p == beg)
    return Qnil;

  while (p != beg && p[-1] != '/'
#ifdef VMS
	 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
#endif /* VMS */
#ifdef MSDOS
	 && p[-1] != ':' && p[-1] != '\\'
#endif
	 ) p--;

  return make_string (p, end - p);
}

      out[size] = '\0';
    }
#else /* not VMS */
  /* For Unix syntax, Append a slash if necessary */
#ifdef MSDOS
  if (out[size] != ':' && out[size] != '/' && out[size] != '\\')
#else
  if (out[size] != '/')
#endif
    strcat (out, "/");
#endif /* not VMS */

#endif /* VMS */
  /* Process as Unix format: just remove any final slash.
     But leave "/" unchanged; do not change it to "".  */
  strcpy (dst, src);
  if (slen > 1 
#ifdef MSDOS
      && (dst[slen - 1] == '/' || dst[slen - 1] == '/')
      && dst[slen - 2] != ':'
#else
      && dst[slen - 1] == '/'
#endif
      )
    dst[slen - 1] = 0;
  return 1;
}

#endif

  nm = XSTRING (name)->data;
  
#ifdef MSDOS
  /* First map all backslashes to slashes.  */
  dostounix_filename (nm = strcpy (alloca (strlen (nm) + 1), nm));

  /* Now strip drive name. */
  {
    unsigned char *colon = rindex (nm, ':');
    if (colon)
      if (nm == colon)
	nm++;

  unsigned char *xnm;

  CHECK_STRING (string, 0);

  nm = XSTRING (string)->data;
#ifdef MSDOS
  dostounix_filename (nm = strcpy (alloca (strlen (nm) + 1), nm));
  substituted = !strcmp (nm, XSTRING (string)->data);
#endif
  endp = nm + XSTRING (string)->size;

  /* If /~ or // appears, discard everything through first slash. */

  for (p = nm; p != endp; p++)

      || index (ptr, ':') || index (ptr, '<')
      || (*ptr == '[' && (ptr[1] != '-' || (ptr[2] != '.' && ptr[2] != ']'))
	  && ptr[1] != '.')
#endif /* VMS */
#ifdef MSDOS
      || (*ptr != 0 && ptr[1] == ':' && (ptr[2] == '/' || ptr[2] == '\\'))
#endif
      )
    return Qt;
  else
    return Qnil;