[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c
|
From: |
Ken Raeburn |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c |
|
Date: |
Sun, 14 Jul 2002 20:00:50 -0400 |
Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.453 emacs/src/fileio.c:1.454
*** emacs/src/fileio.c:1.453 Fri Jul 12 13:36:47 2002
--- emacs/src/fileio.c Sun Jul 14 20:00:36 2002
***************
*** 269,276 ****
default:
/* System error messages are capitalized. Downcase the initial
unless it is followed by a slash. */
! if (XSTRING (errstring)->data[1] != '/')
! XSTRING (errstring)->data[0] = DOWNCASE (XSTRING
(errstring)->data[0]);
Fsignal (Qfile_error,
Fcons (build_string (string), Fcons (errstring, data)));
--- 269,276 ----
default:
/* System error messages are capitalized. Downcase the initial
unless it is followed by a slash. */
! if (SREF (errstring, 1) != '/')
! SREF (errstring, 0) = DOWNCASE (SREF (errstring, 0));
Fsignal (Qfile_error,
Fcons (build_string (string), Fcons (errstring, data)));
***************
*** 408,418 ****
#ifdef FILE_SYSTEM_CASE
filename = FILE_SYSTEM_CASE (filename);
#endif
! beg = XSTRING (filename)->data;
#ifdef DOS_NT
beg = strcpy (alloca (strlen (beg) + 1), beg);
#endif
! p = beg + STRING_BYTES (XSTRING (filename));
while (p != beg && !IS_DIRECTORY_SEP (p[-1])
#ifdef VMS
--- 408,418 ----
#ifdef FILE_SYSTEM_CASE
filename = FILE_SYSTEM_CASE (filename);
#endif
! beg = SDATA (filename);
#ifdef DOS_NT
beg = strcpy (alloca (strlen (beg) + 1), beg);
#endif
! p = beg + SBYTES (filename);
while (p != beg && !IS_DIRECTORY_SEP (p[-1])
#ifdef VMS
***************
*** 480,487 ****
if (!NILP (handler))
return call2 (handler, Qfile_name_nondirectory, filename);
! beg = XSTRING (filename)->data;
! end = p = beg + STRING_BYTES (XSTRING (filename));
while (p != beg && !IS_DIRECTORY_SEP (p[-1])
#ifdef VMS
--- 480,487 ----
if (!NILP (handler))
return call2 (handler, Qfile_name_nondirectory, filename);
! beg = SDATA (filename);
! end = p = beg + SBYTES (filename);
while (p != beg && !IS_DIRECTORY_SEP (p[-1])
#ifdef VMS
***************
*** 637,644 ****
if (!NILP (handler))
return call2 (handler, Qfile_name_as_directory, file);
! buf = (char *) alloca (STRING_BYTES (XSTRING (file)) + 10);
! return build_string (file_name_as_directory (buf, XSTRING (file)->data));
}
/*
--- 637,644 ----
if (!NILP (handler))
return call2 (handler, Qfile_name_as_directory, file);
! buf = (char *) alloca (SBYTES (file) + 10);
! return build_string (file_name_as_directory (buf, SDATA (file)));
}
/*
***************
*** 833,843 ****
/* 20 extra chars is insufficient for VMS, since we might perform a
logical name translation. an equivalence string can be up to 255
chars long, so grab that much extra space... - sss */
! buf = (char *) alloca (STRING_BYTES (XSTRING (directory)) + 20 + 255);
#else
! buf = (char *) alloca (STRING_BYTES (XSTRING (directory)) + 20);
#endif
! directory_file_name (XSTRING (directory)->data, buf);
return build_string (buf);
}
--- 833,843 ----
/* 20 extra chars is insufficient for VMS, since we might perform a
logical name translation. an equivalence string can be up to 255
chars long, so grab that much extra space... - sss */
! buf = (char *) alloca (SBYTES (directory) + 20 + 255);
#else
! buf = (char *) alloca (SBYTES (directory) + 20);
#endif
! directory_file_name (SDATA (directory), buf);
return build_string (buf);
}
***************
*** 912,921 ****
#endif
}
! len = XSTRING (prefix)->size;
val = make_uninit_string (len + 3 + pidlen);
! data = XSTRING (val)->data;
! bcopy(XSTRING (prefix)->data, data, len);
p = data + len;
bcopy (pidbuf, p, pidlen);
--- 912,921 ----
#endif
}
! len = SCHARS (prefix);
val = make_uninit_string (len + 3 + pidlen);
! data = SDATA (val);
! bcopy(SDATA (prefix), data, len);
p = data + len;
bcopy (pidbuf, p, pidlen);
***************
*** 970,976 ****
}
error ("Cannot create temporary name for prefix `%s'",
! XSTRING (prefix)->data);
return Qnil;
}
--- 970,976 ----
}
error ("Cannot create temporary name for prefix `%s'",
! SDATA (prefix));
return Qnil;
}
***************
*** 1073,1079 ****
return call3 (handler, Qexpand_file_name, name, default_directory);
}
! o = XSTRING (default_directory)->data;
/* Make sure DEFAULT_DIRECTORY is properly expanded.
It would be better to do this down below where we actually use
--- 1073,1079 ----
return call3 (handler, Qexpand_file_name, name, default_directory);
}
! o = SDATA (default_directory);
/* Make sure DEFAULT_DIRECTORY is properly expanded.
It would be better to do this down below where we actually use
***************
*** 1118,1124 ****
name = FILE_SYSTEM_CASE (name);
#endif
! nm = XSTRING (name)->data;
#ifdef DOS_NT
/* We will force directory separators to be either all \ or /, so make
--- 1118,1124 ----
name = FILE_SYSTEM_CASE (name);
#endif
! nm = SDATA (name);
#ifdef DOS_NT
/* We will force directory separators to be either all \ or /, so make
***************
*** 1292,1312 ****
#ifdef WINDOWSNT
if (IS_DIRECTORY_SEP (nm[1]))
{
! if (strcmp (nm, XSTRING (name)->data) != 0)
name = build_string (nm);
}
else
#endif
/* drive must be set, so this is okay */
! if (strcmp (nm - 2, XSTRING (name)->data) != 0)
{
name = make_string (nm - 2, p - nm + 2);
! XSTRING (name)->data[0] = DRIVE_LETTER (drive);
! XSTRING (name)->data[1] = ':';
}
return name;
#else /* not DOS_NT */
! if (nm == XSTRING (name)->data)
return name;
return build_string (nm);
#endif /* not DOS_NT */
--- 1292,1312 ----
#ifdef WINDOWSNT
if (IS_DIRECTORY_SEP (nm[1]))
{
! if (strcmp (nm, SDATA (name)) != 0)
name = build_string (nm);
}
else
#endif
/* drive must be set, so this is okay */
! if (strcmp (nm - 2, SDATA (name)) != 0)
{
name = make_string (nm - 2, p - nm + 2);
! SREF (name, 0) = DRIVE_LETTER (drive);
! SREF (name, 1) = ':';
}
return name;
#else /* not DOS_NT */
! if (nm == SDATA (name))
return name;
return build_string (nm);
#endif /* not DOS_NT */
***************
*** 1419,1425 ****
#endif
&& !newdir)
{
! newdir = XSTRING (default_directory)->data;
#ifdef DOS_NT
/* Note if special escape prefix is present, but remove for now. */
if (newdir[0] == '/' && newdir[1] == ':')
--- 1419,1425 ----
#endif
&& !newdir)
{
! newdir = SDATA (default_directory);
#ifdef DOS_NT
/* Note if special escape prefix is present, but remove for now. */
if (newdir[0] == '/' && newdir[1] == ':')
***************
*** 1726,1732 ****
name = Fupcase (name);
#endif
! nm = XSTRING (name)->data;
/* If nm is absolute, flush ...// and detect /./ and /../.
If no /./ or /../ we can return right away. */
--- 1726,1732 ----
name = Fupcase (name);
#endif
! nm = SDATA (name);
/* If nm is absolute, flush ...// and detect /./ and /../.
If no /./ or /../ we can return right away. */
***************
*** 1835,1841 ****
if (index (nm, '/'))
return build_string (sys_translate_unix (nm));
#endif /* VMS */
! if (nm == XSTRING (name)->data)
return name;
return build_string (nm);
}
--- 1835,1841 ----
if (index (nm, '/'))
return build_string (sys_translate_unix (nm));
#endif /* VMS */
! if (nm == SDATA (name))
return name;
return build_string (nm);
}
***************
*** 1896,1902 ****
if (NILP (defalt))
defalt = current_buffer->directory;
CHECK_STRING (defalt);
! newdir = XSTRING (defalt)->data;
}
/* Now concatenate the directory and name to new space in the stack frame */
--- 1896,1902 ----
if (NILP (defalt))
defalt = current_buffer->directory;
CHECK_STRING (defalt);
! newdir = SDATA (defalt);
}
/* Now concatenate the directory and name to new space in the stack frame */
***************
*** 2046,2058 ****
if (!NILP (handler))
return call2 (handler, Qsubstitute_in_file_name, filename);
! nm = XSTRING (filename)->data;
#ifdef DOS_NT
nm = strcpy (alloca (strlen (nm) + 1), nm);
CORRECT_DIR_SEPS (nm);
! substituted = (strcmp (nm, XSTRING (filename)->data) != 0);
#endif
! endp = nm + STRING_BYTES (XSTRING (filename));
/* If /~ or // appears, discard everything through first slash. */
--- 2046,2058 ----
if (!NILP (handler))
return call2 (handler, Qsubstitute_in_file_name, filename);
! nm = SDATA (filename);
#ifdef DOS_NT
nm = strcpy (alloca (strlen (nm) + 1), nm);
CORRECT_DIR_SEPS (nm);
! substituted = (strcmp (nm, SDATA (filename)) != 0);
#endif
! endp = nm + SBYTES (filename);
/* If /~ or // appears, discard everything through first slash. */
***************
*** 2168,2174 ****
/* If substitution required, recopy the string and do it */
/* Make space in stack frame for the new copy */
! xnm = (unsigned char *) alloca (STRING_BYTES (XSTRING (filename)) + total +
1);
x = xnm;
/* Copy the rest of the name through, replacing $ constructs with values */
--- 2168,2174 ----
/* If substitution required, recopy the string and do it */
/* Make space in stack frame for the new copy */
! xnm = (unsigned char *) alloca (SBYTES (filename) + total + 1);
x = xnm;
/* Copy the rest of the name through, replacing $ constructs with values */
***************
*** 2279,2294 ****
absname = Fexpand_file_name (filename, defdir);
#ifdef VMS
{
! register int c = XSTRING (absname)->data[STRING_BYTES (XSTRING (absname))
- 1];
if (c == ':' || c == ']' || c == '>')
absname = Fdirectory_file_name (absname);
}
#else
/* Remove final slash, if any (unless this is the root dir).
stat behaves differently depending! */
! if (XSTRING (absname)->size > 1
! && IS_DIRECTORY_SEP (XSTRING (absname)->data[STRING_BYTES (XSTRING
(absname)) - 1])
! && !IS_DEVICE_SEP (XSTRING (absname)->data[STRING_BYTES (XSTRING
(absname))-2]))
/* We cannot take shortcuts; they might be wrong for magic file names. */
absname = Fdirectory_file_name (absname);
#endif
--- 2279,2294 ----
absname = Fexpand_file_name (filename, defdir);
#ifdef VMS
{
! register int c = SREF (absname, SBYTES (absname) - 1);
if (c == ':' || c == ']' || c == '>')
absname = Fdirectory_file_name (absname);
}
#else
/* Remove final slash, if any (unless this is the root dir).
stat behaves differently depending! */
! if (SCHARS (absname) > 1
! && IS_DIRECTORY_SEP (SREF (absname, SBYTES (absname) - 1))
! && !IS_DEVICE_SEP (SREF (absname, SBYTES (absname)-2)))
/* We cannot take shortcuts; they might be wrong for magic file names. */
absname = Fdirectory_file_name (absname);
#endif
***************
*** 2323,2329 ****
/* stat is a good way to tell whether the file exists,
regardless of what access permissions it has. */
! if (stat (XSTRING (encoded_filename)->data, &statbuf) >= 0)
{
if (! interactive)
Fsignal (Qfile_already_exists,
--- 2323,2329 ----
/* stat is a good way to tell whether the file exists,
regardless of what access permissions it has. */
! if (stat (SDATA (encoded_filename), &statbuf) >= 0)
{
if (! interactive)
Fsignal (Qfile_already_exists,
***************
*** 2331,2337 ****
Fcons (absname, Qnil)));
GCPRO1 (absname);
tem = format1 ("File %s already exists; %s anyway? ",
! XSTRING (absname)->data, querystring);
if (quick)
tem = Fy_or_n_p (tem);
else
--- 2331,2337 ----
Fcons (absname, Qnil)));
GCPRO1 (absname);
tem = format1 ("File %s already exists; %s anyway? ",
! SDATA (absname), querystring);
if (quick)
tem = Fy_or_n_p (tem);
else
***************
*** 2404,2415 ****
|| INTEGERP (ok_if_already_exists))
barf_or_query_if_file_exists (encoded_newname, "copy to it",
INTEGERP (ok_if_already_exists), &out_st, 0);
! else if (stat (XSTRING (encoded_newname)->data, &out_st) < 0)
out_st.st_mode = 0;
#ifdef WINDOWSNT
! if (!CopyFile (XSTRING (encoded_file)->data,
! XSTRING (encoded_newname)->data,
FALSE))
report_file_error ("Copying file", Fcons (file, Fcons (newname, Qnil)));
else if (NILP (keep_time))
--- 2404,2415 ----
|| INTEGERP (ok_if_already_exists))
barf_or_query_if_file_exists (encoded_newname, "copy to it",
INTEGERP (ok_if_already_exists), &out_st, 0);
! else if (stat (SDATA (encoded_newname), &out_st) < 0)
out_st.st_mode = 0;
#ifdef WINDOWSNT
! if (!CopyFile (SDATA (encoded_file),
! SDATA (encoded_newname),
FALSE))
report_file_error ("Copying file", Fcons (file, Fcons (newname, Qnil)));
else if (NILP (keep_time))
***************
*** 2419,2425 ****
char * filename;
EMACS_GET_TIME (now);
! filename = XSTRING (encoded_newname)->data;
/* Ensure file is writable while its modified time is set. */
attributes = GetFileAttributes (filename);
--- 2419,2425 ----
char * filename;
EMACS_GET_TIME (now);
! filename = SDATA (encoded_newname);
/* Ensure file is writable while its modified time is set. */
attributes = GetFileAttributes (filename);
***************
*** 2436,2442 ****
SetFileAttributes (filename, attributes);
}
#else /* not WINDOWSNT */
! ifd = emacs_open (XSTRING (encoded_file)->data, O_RDONLY, 0);
if (ifd < 0)
report_file_error ("Opening input file", Fcons (file, Qnil));
--- 2436,2442 ----
SetFileAttributes (filename, attributes);
}
#else /* not WINDOWSNT */
! ifd = emacs_open (SDATA (encoded_file), O_RDONLY, 0);
if (ifd < 0)
report_file_error ("Opening input file", Fcons (file, Qnil));
***************
*** 2472,2484 ****
#ifdef VMS
/* Create the copy file with the same record format as the input file */
! ofd = sys_creat (XSTRING (encoded_newname)->data, 0666, ifd);
#else
#ifdef MSDOS
/* System's default file type was set to binary by _fmode in emacs.c. */
! ofd = creat (XSTRING (encoded_newname)->data, S_IREAD | S_IWRITE);
#else /* not MSDOS */
! ofd = creat (XSTRING (encoded_newname)->data, 0666);
#endif /* not MSDOS */
#endif /* VMS */
if (ofd < 0)
--- 2472,2484 ----
#ifdef VMS
/* Create the copy file with the same record format as the input file */
! ofd = sys_creat (SDATA (encoded_newname), 0666, ifd);
#else
#ifdef MSDOS
/* System's default file type was set to binary by _fmode in emacs.c. */
! ofd = creat (SDATA (encoded_newname), S_IREAD | S_IWRITE);
#else /* not MSDOS */
! ofd = creat (SDATA (encoded_newname), 0666);
#endif /* not MSDOS */
#endif /* VMS */
if (ofd < 0)
***************
*** 2504,2517 ****
EMACS_TIME atime, mtime;
EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
! if (set_file_times (XSTRING (encoded_newname)->data,
atime, mtime))
Fsignal (Qfile_date_error,
Fcons (build_string ("Cannot set file date"),
Fcons (newname, Qnil)));
}
#ifndef MSDOS
! chmod (XSTRING (encoded_newname)->data, st.st_mode & 07777);
#else /* MSDOS */
#if defined (__DJGPP__) && __DJGPP__ > 1
/* In DJGPP v2.0 and later, fstat usually returns true file mode bits,
--- 2504,2517 ----
EMACS_TIME atime, mtime;
EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
! if (set_file_times (SDATA (encoded_newname),
atime, mtime))
Fsignal (Qfile_date_error,
Fcons (build_string ("Cannot set file date"),
Fcons (newname, Qnil)));
}
#ifndef MSDOS
! chmod (SDATA (encoded_newname), st.st_mode & 07777);
#else /* MSDOS */
#if defined (__DJGPP__) && __DJGPP__ > 1
/* In DJGPP v2.0 and later, fstat usually returns true file mode bits,
***************
*** 2519,2525 ****
get only the READ bit, which will make the copied file read-only,
so it's better not to chmod at all. */
if ((_djstat_flags & _STFAIL_WRITEBIT) == 0)
! chmod (XSTRING (encoded_newname)->data, st.st_mode & 07777);
#endif /* DJGPP version 2 or newer */
#endif /* MSDOS */
}
--- 2519,2525 ----
get only the READ bit, which will make the copied file read-only,
so it's better not to chmod at all. */
if ((_djstat_flags & _STFAIL_WRITEBIT) == 0)
! chmod (SDATA (encoded_newname), st.st_mode & 07777);
#endif /* DJGPP version 2 or newer */
#endif /* MSDOS */
}
***************
*** 2553,2559 ****
encoded_dir = ENCODE_FILE (directory);
! dir = XSTRING (encoded_dir)->data;
#ifdef WINDOWSNT
if (mkdir (dir) != 0)
--- 2553,2559 ----
encoded_dir = ENCODE_FILE (directory);
! dir = SDATA (encoded_dir);
#ifdef WINDOWSNT
if (mkdir (dir) != 0)
***************
*** 2583,2589 ****
encoded_dir = ENCODE_FILE (directory);
! dir = XSTRING (encoded_dir)->data;
if (rmdir (dir) != 0)
report_file_error ("Removing directory", Flist (1, &directory));
--- 2583,2589 ----
encoded_dir = ENCODE_FILE (directory);
! dir = SDATA (encoded_dir);
if (rmdir (dir) != 0)
report_file_error ("Removing directory", Flist (1, &directory));
***************
*** 2609,2615 ****
encoded_file = ENCODE_FILE (filename);
! if (0 > unlink (XSTRING (encoded_file)->data))
report_file_error ("Removing old name", Flist (1, &filename));
return Qnil;
}
--- 2609,2615 ----
encoded_file = ENCODE_FILE (filename);
! if (0 > unlink (SDATA (encoded_file)))
report_file_error ("Removing old name", Flist (1, &filename));
return Qnil;
}
***************
*** 2679,2688 ****
barf_or_query_if_file_exists (encoded_newname, "rename to it",
INTEGERP (ok_if_already_exists), 0, 0);
#ifndef BSD4_1
! if (0 > rename (XSTRING (encoded_file)->data, XSTRING
(encoded_newname)->data))
#else
! if (0 > link (XSTRING (encoded_file)->data, XSTRING (encoded_newname)->data)
! || 0 > unlink (XSTRING (encoded_file)->data))
#endif
{
if (errno == EXDEV)
--- 2679,2688 ----
barf_or_query_if_file_exists (encoded_newname, "rename to it",
INTEGERP (ok_if_already_exists), 0, 0);
#ifndef BSD4_1
! if (0 > rename (SDATA (encoded_file), SDATA (encoded_newname)))
#else
! if (0 > link (SDATA (encoded_file), SDATA (encoded_newname))
! || 0 > unlink (SDATA (encoded_file)))
#endif
{
if (errno == EXDEV)
***************
*** 2754,2761 ****
barf_or_query_if_file_exists (encoded_newname, "make it a new name",
INTEGERP (ok_if_already_exists), 0, 0);
! unlink (XSTRING (newname)->data);
! if (0 > link (XSTRING (encoded_file)->data, XSTRING
(encoded_newname)->data))
{
#ifdef NO_ARG_ARRAY
args[0] = file;
--- 2754,2761 ----
barf_or_query_if_file_exists (encoded_newname, "make it a new name",
INTEGERP (ok_if_already_exists), 0, 0);
! unlink (SDATA (newname));
! if (0 > link (SDATA (encoded_file), SDATA (encoded_newname)))
{
#ifdef NO_ARG_ARRAY
args[0] = file;
***************
*** 2795,2801 ****
/* If the link target has a ~, we must expand it to get
a truly valid file name. Otherwise, do not expand;
we want to permit links to relative file names. */
! if (XSTRING (filename)->data[0] == '~')
filename = Fexpand_file_name (filename, Qnil);
linkname = Fexpand_file_name (linkname, Qnil);
--- 2795,2801 ----
/* If the link target has a ~, we must expand it to get
a truly valid file name. Otherwise, do not expand;
we want to permit links to relative file names. */
! if (SREF (filename, 0) == '~')
filename = Fexpand_file_name (filename, Qnil);
linkname = Fexpand_file_name (linkname, Qnil);
***************
*** 2820,2834 ****
|| INTEGERP (ok_if_already_exists))
barf_or_query_if_file_exists (encoded_linkname, "make it a link",
INTEGERP (ok_if_already_exists), 0, 0);
! if (0 > symlink (XSTRING (encoded_filename)->data,
! XSTRING (encoded_linkname)->data))
{
/* If we didn't complain already, silently delete existing file. */
if (errno == EEXIST)
{
! unlink (XSTRING (encoded_linkname)->data);
! if (0 <= symlink (XSTRING (encoded_filename)->data,
! XSTRING (encoded_linkname)->data))
{
UNGCPRO;
return Qnil;
--- 2820,2834 ----
|| INTEGERP (ok_if_already_exists))
barf_or_query_if_file_exists (encoded_linkname, "make it a link",
INTEGERP (ok_if_already_exists), 0, 0);
! if (0 > symlink (SDATA (encoded_filename),
! SDATA (encoded_linkname)))
{
/* If we didn't complain already, silently delete existing file. */
if (errno == EEXIST)
{
! unlink (SDATA (encoded_linkname));
! if (0 <= symlink (SDATA (encoded_filename),
! SDATA (encoded_linkname)))
{
UNGCPRO;
return Qnil;
***************
*** 2860,2874 ****
{
CHECK_STRING (name);
if (NILP (string))
! delete_logical_name (XSTRING (name)->data);
else
{
CHECK_STRING (string);
! if (XSTRING (string)->size == 0)
! delete_logical_name (XSTRING (name)->data);
else
! define_logical_name (XSTRING (name)->data, XSTRING (string)->data);
}
return string;
--- 2860,2874 ----
{
CHECK_STRING (name);
if (NILP (string))
! delete_logical_name (SDATA (name));
else
{
CHECK_STRING (string);
! if (SCHARS (string) == 0)
! delete_logical_name (SDATA (name));
else
! define_logical_name (SDATA (name), SDATA (string));
}
return string;
***************
*** 2887,2893 ****
CHECK_STRING (path);
CHECK_STRING (login);
! netresult = netunam (XSTRING (path)->data, XSTRING (login)->data);
if (netresult == -1)
return Qnil;
--- 2887,2893 ----
CHECK_STRING (path);
CHECK_STRING (login);
! netresult = netunam (SDATA (path), SDATA (login));
if (netresult == -1)
return Qnil;
***************
*** 2906,2912 ****
unsigned char *ptr;
CHECK_STRING (filename);
! ptr = XSTRING (filename)->data;
if (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
#ifdef VMS
/* ??? This criterion is probably wrong for '<'. */
--- 2906,2912 ----
unsigned char *ptr;
CHECK_STRING (filename);
! ptr = SDATA (filename);
if (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
#ifdef VMS
/* ??? This criterion is probably wrong for '<'. */
***************
*** 3003,3009 ****
absname = ENCODE_FILE (absname);
! return (stat (XSTRING (absname)->data, &statbuf) >= 0) ? Qt : Qnil;
}
DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0,
--- 3003,3009 ----
absname = ENCODE_FILE (absname);
! return (stat (SDATA (absname), &statbuf) >= 0) ? Qt : Qnil;
}
DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0,
***************
*** 3026,3032 ****
absname = ENCODE_FILE (absname);
! return (check_executable (XSTRING (absname)->data) ? Qt : Qnil);
}
DEFUN ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0,
--- 3026,3032 ----
absname = ENCODE_FILE (absname);
! return (check_executable (SDATA (absname)) ? Qt : Qnil);
}
DEFUN ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0,
***************
*** 3055,3061 ****
#if defined(DOS_NT) || defined(macintosh)
/* Under MS-DOS, Windows, and Macintosh, open does not work for
directories. */
! if (access (XSTRING (absname)->data, 0) == 0)
return Qt;
return Qnil;
#else /* not DOS_NT and not macintosh */
--- 3055,3061 ----
#if defined(DOS_NT) || defined(macintosh)
/* Under MS-DOS, Windows, and Macintosh, open does not work for
directories. */
! if (access (SDATA (absname), 0) == 0)
return Qt;
return Qnil;
#else /* not DOS_NT and not macintosh */
***************
*** 3064,3076 ****
/* Opening a fifo without O_NONBLOCK can wait.
We don't want to wait. But we don't want to mess wth O_NONBLOCK
except in the case of a fifo, on a system which handles it. */
! desc = stat (XSTRING (absname)->data, &statbuf);
if (desc < 0)
return Qnil;
if (S_ISFIFO (statbuf.st_mode))
flags |= O_NONBLOCK;
#endif
! desc = emacs_open (XSTRING (absname)->data, flags, 0);
if (desc < 0)
return Qnil;
emacs_close (desc);
--- 3064,3076 ----
/* Opening a fifo without O_NONBLOCK can wait.
We don't want to wait. But we don't want to mess wth O_NONBLOCK
except in the case of a fifo, on a system which handles it. */
! desc = stat (SDATA (absname), &statbuf);
if (desc < 0)
return Qnil;
if (S_ISFIFO (statbuf.st_mode))
flags |= O_NONBLOCK;
#endif
! desc = emacs_open (SDATA (absname), flags, 0);
if (desc < 0)
return Qnil;
emacs_close (desc);
***************
*** 3099,3106 ****
return call2 (handler, Qfile_writable_p, absname);
encoded = ENCODE_FILE (absname);
! if (stat (XSTRING (encoded)->data, &statbuf) >= 0)
! return (check_writable (XSTRING (encoded)->data)
? Qt : Qnil);
dir = Ffile_name_directory (absname);
--- 3099,3106 ----
return call2 (handler, Qfile_writable_p, absname);
encoded = ENCODE_FILE (absname);
! if (stat (SDATA (encoded), &statbuf) >= 0)
! return (check_writable (SDATA (encoded))
? Qt : Qnil);
dir = Ffile_name_directory (absname);
***************
*** 3118,3128 ****
/* The read-only attribute of the parent directory doesn't affect
whether a file or directory can be created within it. Some day we
should check ACLs though, which do affect this. */
! if (stat (XSTRING (dir)->data, &statbuf) < 0)
return Qnil;
return (statbuf.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
#else
! return (check_writable (!NILP (dir) ? (char *) XSTRING (dir)->data : "")
? Qt : Qnil);
#endif
}
--- 3118,3128 ----
/* The read-only attribute of the parent directory doesn't affect
whether a file or directory can be created within it. Some day we
should check ACLs though, which do affect this. */
! if (stat (SDATA (dir), &statbuf) < 0)
return Qnil;
return (statbuf.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
#else
! return (check_writable (!NILP (dir) ? (char *) SDATA (dir) : "")
? Qt : Qnil);
#endif
}
***************
*** 3150,3158 ****
encoded_filename = ENCODE_FILE (absname);
! fd = emacs_open (XSTRING (encoded_filename)->data, O_RDONLY, 0);
if (fd < 0)
! report_file_error (XSTRING (string)->data, Fcons (filename, Qnil));
emacs_close (fd);
return Qnil;
--- 3150,3158 ----
encoded_filename = ENCODE_FILE (absname);
! fd = emacs_open (SDATA (encoded_filename), O_RDONLY, 0);
if (fd < 0)
! report_file_error (SDATA (string), Fcons (filename, Qnil));
emacs_close (fd);
return Qnil;
***************
*** 3192,3198 ****
bzero (buf, bufsize);
errno = 0;
! valsize = readlink (XSTRING (filename)->data, buf, bufsize);
if (valsize == -1)
{
#ifdef ERANGE
--- 3192,3198 ----
bzero (buf, bufsize);
errno = 0;
! valsize = readlink (SDATA (filename), buf, bufsize);
if (valsize == -1)
{
#ifdef ERANGE
***************
*** 3241,3247 ****
absname = ENCODE_FILE (absname);
! if (stat (XSTRING (absname)->data, &st) < 0)
return Qnil;
return (st.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
}
--- 3241,3247 ----
absname = ENCODE_FILE (absname);
! if (stat (SDATA (absname), &st) < 0)
return Qnil;
return (st.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
}
***************
*** 3307,3313 ****
/* Tell stat to use expensive method to get accurate info. */
Vw32_get_true_file_attributes = Qt;
! result = stat (XSTRING (absname)->data, &st);
Vw32_get_true_file_attributes = tem;
if (result < 0)
--- 3307,3313 ----
/* Tell stat to use expensive method to get accurate info. */
Vw32_get_true_file_attributes = Qt;
! result = stat (SDATA (absname), &st);
Vw32_get_true_file_attributes = tem;
if (result < 0)
***************
*** 3315,3321 ****
return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
}
#else
! if (stat (XSTRING (absname)->data, &st) < 0)
return Qnil;
return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
#endif
--- 3315,3321 ----
return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
}
#else
! if (stat (SDATA (absname), &st) < 0)
return Qnil;
return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
#endif
***************
*** 3340,3349 ****
absname = ENCODE_FILE (absname);
! if (stat (XSTRING (absname)->data, &st) < 0)
return Qnil;
#if defined (MSDOS) && __DJGPP__ < 2
! if (check_executable (XSTRING (absname)->data))
st.st_mode |= S_IEXEC;
#endif /* MSDOS && __DJGPP__ < 2 */
--- 3340,3349 ----
absname = ENCODE_FILE (absname);
! if (stat (SDATA (absname), &st) < 0)
return Qnil;
#if defined (MSDOS) && __DJGPP__ < 2
! if (check_executable (SDATA (absname)))
st.st_mode |= S_IEXEC;
#endif /* MSDOS && __DJGPP__ < 2 */
***************
*** 3370,3376 ****
encoded_absname = ENCODE_FILE (absname);
! if (chmod (XSTRING (encoded_absname)->data, XINT (mode)) < 0)
report_file_error ("Doing chmod", Fcons (absname, Qnil));
return Qnil;
--- 3370,3376 ----
encoded_absname = ENCODE_FILE (absname);
! if (chmod (SDATA (encoded_absname), XINT (mode)) < 0)
report_file_error ("Doing chmod", Fcons (absname, Qnil));
return Qnil;
***************
*** 3456,3467 ****
absname2 = ENCODE_FILE (absname2);
UNGCPRO;
! if (stat (XSTRING (absname1)->data, &st) < 0)
return Qnil;
mtime1 = st.st_mtime;
! if (stat (XSTRING (absname2)->data, &st) < 0)
return Qt;
return (mtime1 > st.st_mtime) ? Qt : Qnil;
--- 3456,3467 ----
absname2 = ENCODE_FILE (absname2);
UNGCPRO;
! if (stat (SDATA (absname1), &st) < 0)
return Qnil;
mtime1 = st.st_mtime;
! if (stat (SDATA (absname2), &st) < 0)
return Qt;
return (mtime1 > st.st_mtime) ? Qt : Qnil;
***************
*** 3640,3654 ****
/* Tell stat to use expensive method to get accurate info. */
Vw32_get_true_file_attributes = Qt;
! total = stat (XSTRING (filename)->data, &st);
Vw32_get_true_file_attributes = tem;
}
if (total < 0)
#else
#ifndef APOLLO
! if (stat (XSTRING (filename)->data, &st) < 0)
#else
! if ((fd = emacs_open (XSTRING (filename)->data, O_RDONLY, 0)) < 0
|| fstat (fd, &st) < 0)
#endif /* not APOLLO */
#endif /* WINDOWSNT */
--- 3640,3654 ----
/* Tell stat to use expensive method to get accurate info. */
Vw32_get_true_file_attributes = Qt;
! total = stat (SDATA (filename), &st);
Vw32_get_true_file_attributes = tem;
}
if (total < 0)
#else
#ifndef APOLLO
! if (stat (SDATA (filename), &st) < 0)
#else
! if ((fd = emacs_open (SDATA (filename), O_RDONLY, 0)) < 0
|| fstat (fd, &st) < 0)
#endif /* not APOLLO */
#endif /* WINDOWSNT */
***************
*** 3683,3689 ****
#endif
if (fd < 0)
! if ((fd = emacs_open (XSTRING (filename)->data, O_RDONLY, 0)) < 0)
goto badopen;
/* Replacement should preserve point as it preserves markers. */
--- 3683,3689 ----
#endif
if (fd < 0)
! if ((fd = emacs_open (SDATA (filename), O_RDONLY, 0)) < 0)
goto badopen;
/* Replacement should preserve point as it preserves markers. */
***************
*** 3779,3785 ****
if (nread < 0)
error ("IO error reading %s: %s",
! XSTRING (orig_filename)->data, emacs_strerror (errno));
else if (nread > 0)
{
struct buffer *prev = current_buffer;
--- 3779,3785 ----
if (nread < 0)
error ("IO error reading %s: %s",
! SDATA (orig_filename), emacs_strerror (errno));
else if (nread > 0)
{
struct buffer *prev = current_buffer;
***************
*** 3896,3902 ****
nread = emacs_read (fd, buffer, sizeof buffer);
if (nread < 0)
error ("IO error reading %s: %s",
! XSTRING (orig_filename)->data, emacs_strerror (errno));
else if (nread == 0)
break;
--- 3896,3902 ----
nread = emacs_read (fd, buffer, sizeof buffer);
if (nread < 0)
error ("IO error reading %s: %s",
! SDATA (orig_filename), emacs_strerror (errno));
else if (nread == 0)
break;
***************
*** 3967,3973 ****
nread = emacs_read (fd, buffer + total_read, trial - total_read);
if (nread < 0)
error ("IO error reading %s: %s",
! XSTRING (orig_filename)->data, emacs_strerror (errno));
else if (nread == 0)
break;
total_read += nread;
--- 3967,3973 ----
nread = emacs_read (fd, buffer + total_read, trial - total_read);
if (nread < 0)
error ("IO error reading %s: %s",
! SDATA (orig_filename), emacs_strerror (errno));
else if (nread == 0)
break;
total_read += nread;
***************
*** 4150,4156 ****
if (how_much == -1)
error ("IO error reading %s: %s",
! XSTRING (orig_filename)->data, emacs_strerror (errno));
else if (how_much == -2)
error ("maximum buffer size exceeded");
}
--- 4150,4156 ----
if (how_much == -1)
error ("IO error reading %s: %s",
! SDATA (orig_filename), emacs_strerror (errno));
else if (how_much == -2)
error ("maximum buffer size exceeded");
}
***************
*** 4370,4376 ****
if (how_much < 0)
error ("IO error reading %s: %s",
! XSTRING (orig_filename)->data, emacs_strerror (errno));
notfound:
--- 4370,4376 ----
if (how_much < 0)
error ("IO error reading %s: %s",
! SDATA (orig_filename), emacs_strerror (errno));
notfound:
***************
*** 4493,4499 ****
if (!EQ (current_buffer->undo_list, Qt))
current_buffer->undo_list = Qnil;
#ifdef APOLLO
! stat (XSTRING (filename)->data, &st);
#endif
if (NILP (handler))
--- 4493,4499 ----
if (!EQ (current_buffer->undo_list, Qt))
current_buffer->undo_list = Qnil;
#ifdef APOLLO
! stat (SDATA (filename), &st);
#endif
if (NILP (handler))
***************
*** 4880,4886 ****
encoded_filename = ENCODE_FILE (filename);
! fn = XSTRING (encoded_filename)->data;
desc = -1;
if (!NILP (append))
#ifdef DOS_NT
--- 4880,4886 ----
encoded_filename = ENCODE_FILE (filename);
! fn = SDATA (encoded_filename);
desc = -1;
if (!NILP (append))
#ifdef DOS_NT
***************
*** 4897,4903 ****
desc = emacs_open (fn, O_RDWR, 0);
if (desc < 0)
desc = creat_copy_attrs (STRINGP (current_buffer->filename)
! ? XSTRING (current_buffer->filename)->data :
0,
fn);
}
else /* Write to temporary name and rename if no errors */
--- 4897,4903 ----
desc = emacs_open (fn, O_RDWR, 0);
if (desc < 0)
desc = creat_copy_attrs (STRINGP (current_buffer->filename)
! ? SDATA (current_buffer->filename) : 0,
fn);
}
else /* Write to temporary name and rename if no errors */
***************
*** 4909,4916 ****
{
temp_name = Fmake_temp_name (concat2 (temp_name,
build_string ("$$SAVE$$")));
! fname = XSTRING (filename)->data;
! fn = XSTRING (temp_name)->data;
desc = creat_copy_attrs (fname, fn);
if (desc < 0)
{
--- 4909,4916 ----
{
temp_name = Fmake_temp_name (concat2 (temp_name,
build_string ("$$SAVE$$")));
! fname = SDATA (filename);
! fn = SDATA (temp_name);
desc = creat_copy_attrs (fname, fn);
if (desc < 0)
{
***************
*** 5019,5025 ****
if (STRINGP (start))
{
! failure = 0 > a_write (desc, start, 0, XSTRING (start)->size,
&annotations, &coding);
save_errno = errno;
}
--- 5019,5025 ----
if (STRINGP (start))
{
! failure = 0 > a_write (desc, start, 0, SCHARS (start),
&annotations, &coding);
save_errno = errno;
}
***************
*** 5129,5135 ****
current_buffer->modtime = st.st_mtime;
if (failure)
! error ("IO error writing %s: %s", XSTRING (filename)->data,
emacs_strerror (save_errno));
if (visiting)
--- 5129,5135 ----
current_buffer->modtime = st.st_mtime;
if (failure)
! error ("IO error writing %s: %s", SDATA (filename),
emacs_strerror (save_errno));
if (visiting)
***************
*** 5304,5310 ****
tem = Fcdr (Fcar (*annot));
if (STRINGP (tem))
{
! if (0 > e_write (desc, tem, 0, XSTRING (tem)->size, coding))
return -1;
}
*annot = Fcdr (*annot);
--- 5304,5310 ----
tem = Fcdr (Fcar (*annot));
if (STRINGP (tem))
{
! if (0 > e_write (desc, tem, 0, SCHARS (tem), coding))
return -1;
}
*annot = Fcdr (*annot);
***************
*** 5340,5347 ****
if (STRINGP (string))
{
! addr = XSTRING (string)->data;
! nbytes = STRING_BYTES (XSTRING (string));
coding->src_multibyte = STRING_MULTIBYTE (string);
}
else if (start < end)
--- 5340,5347 ----
if (STRINGP (string))
{
! addr = SDATA (string);
! nbytes = SBYTES (string);
coding->src_multibyte = STRING_MULTIBYTE (string);
}
else if (start < end)
***************
*** 5429,5435 ****
filename = ENCODE_FILE (b->filename);
! if (stat (XSTRING (filename)->data, &st) < 0)
{
/* If the file doesn't exist now and didn't exist before,
we say that it isn't modified, provided the error is a tame one. */
--- 5429,5435 ----
filename = ENCODE_FILE (b->filename);
! if (stat (SDATA (filename), &st) < 0)
{
/* If the file doesn't exist now and didn't exist before,
we say that it isn't modified, provided the error is a tame one. */
***************
*** 5497,5503 ****
filename = ENCODE_FILE (filename);
! if (stat (XSTRING (filename)->data, &st) >= 0)
current_buffer->modtime = st.st_mtime;
}
--- 5497,5503 ----
filename = ENCODE_FILE (filename);
! if (stat (SDATA (filename), &st) >= 0)
current_buffer->modtime = st.st_mtime;
}
***************
*** 5519,5532 ****
args[2] = Ferror_message_string (error);
msg = Fformat (3, args);
GCPRO1 (msg);
! nbytes = STRING_BYTES (XSTRING (msg));
for (i = 0; i < 3; ++i)
{
if (i == 0)
! message2 (XSTRING (msg)->data, nbytes, STRING_MULTIBYTE (msg));
else
! message2_nolog (XSTRING (msg)->data, nbytes, STRING_MULTIBYTE (msg));
Fsleep_for (make_number (1), Qnil);
}
--- 5519,5532 ----
args[2] = Ferror_message_string (error);
msg = Fformat (3, args);
GCPRO1 (msg);
! nbytes = SBYTES (msg);
for (i = 0; i < 3; ++i)
{
if (i == 0)
! message2 (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
else
! message2_nolog (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
Fsleep_for (make_number (1), Qnil);
}
***************
*** 5541,5547 ****
/* Get visited file's mode to become the auto save file's mode. */
if (! NILP (current_buffer->filename)
! && stat (XSTRING (current_buffer->filename)->data, &st) >= 0)
/* But make sure we can overwrite it later! */
auto_save_mode_bits = st.st_mode | 0600;
else
--- 5541,5547 ----
/* Get visited file's mode to become the auto save file's mode. */
if (! NILP (current_buffer->filename)
! && stat (SDATA (current_buffer->filename), &st) >= 0)
/* But make sure we can overwrite it later! */
auto_save_mode_bits = st.st_mode | 0600;
else
***************
*** 5635,5641 ****
call2 (Qmake_directory, dir, Qt);
}
! stream = fopen (XSTRING (listfile)->data, "w");
if (stream != NULL)
{
/* Arrange to close that file whether or not we get an error.
--- 5635,5641 ----
call2 (Qmake_directory, dir, Qt);
}
! stream = fopen (SDATA (listfile), "w");
if (stream != NULL)
{
/* Arrange to close that file whether or not we get an error.
***************
*** 5678,5689 ****
{
if (!NILP (b->filename))
{
! fwrite (XSTRING (b->filename)->data, 1,
! STRING_BYTES (XSTRING (b->filename)), stream);
}
putc ('\n', stream);
! fwrite (XSTRING (b->auto_save_file_name)->data, 1,
! STRING_BYTES (XSTRING (b->auto_save_file_name)), stream);
putc ('\n', stream);
}
--- 5678,5689 ----
{
if (!NILP (b->filename))
{
! fwrite (SDATA (b->filename), 1,
! SBYTES (b->filename), stream);
}
putc ('\n', stream);
! fwrite (SDATA (b->auto_save_file_name), 1,
! SBYTES (b->auto_save_file_name), stream);
putc ('\n', stream);
}
***************
*** 5817,5833 ****
register int n;
int osize, count;
! osize = STRING_BYTES (XSTRING (val));
/* Count the number of $ characters. */
! for (n = osize, count = 0, old = XSTRING (val)->data; n > 0; n--)
if (*old++ == '$') count++;
if (count > 0)
{
! old = XSTRING (val)->data;
! val = make_uninit_multibyte_string (XSTRING (val)->size + count,
osize + count);
! new = XSTRING (val)->data;
for (n = osize; n > 0; n--)
if (*old != '$')
*new++ = *old++;
--- 5817,5833 ----
register int n;
int osize, count;
! osize = SBYTES (val);
/* Count the number of $ characters. */
! for (n = osize, count = 0, old = SDATA (val); n > 0; n--)
if (*old++ == '$') count++;
if (count > 0)
{
! old = SDATA (val);
! val = make_uninit_multibyte_string (SCHARS (val) + count,
osize + count);
! new = SDATA (val);
for (n = osize; n > 0; n--)
if (*old != '$')
*new++ = *old++;
***************
*** 5870,5876 ****
/* No need to protect ACTION--we only compare it with t and nil. */
GCPRO5 (string, realdir, name, specdir, orig_string);
! if (XSTRING (string)->size == 0)
{
if (EQ (action, Qlambda))
{
--- 5870,5876 ----
/* No need to protect ACTION--we only compare it with t and nil. */
GCPRO5 (string, realdir, name, specdir, orig_string);
! if (SCHARS (string) == 0)
{
if (EQ (action, Qlambda))
{
***************
*** 5931,5938 ****
Lisp_Object tem = XCAR (all);
int len;
if (STRINGP (tem) &&
! (len = XSTRING (tem)->size, len > 0) &&
! IS_DIRECTORY_SEP (XSTRING (tem)->data[len-1]))
comp = Fcons (tem, comp);
}
}
--- 5931,5938 ----
Lisp_Object tem = XCAR (all);
int len;
if (STRINGP (tem) &&
! (len = SCHARS (tem), len > 0) &&
! IS_DIRECTORY_SEP (SREF (tem, len-1)))
comp = Fcons (tem, comp);
}
}
***************
*** 5957,5963 ****
#ifdef VMS
/* Supposedly this helps commands such as `cd' that read directory names,
but can someone explain how it helps them? -- RMS */
! if (XSTRING (name)->size == 0)
return Qt;
#endif /* VMS */
if (!NILP (Vread_file_name_predicate))
--- 5957,5963 ----
#ifdef VMS
/* Supposedly this helps commands such as `cd' that read directory names,
but can someone explain how it helps them? -- RMS */
! if (SCHARS (name) == 0)
return Qt;
#endif /* VMS */
if (!NILP (Vread_file_name_predicate))
***************
*** 6014,6036 ****
#endif
if (homedir != 0
&& STRINGP (dir)
! && !strncmp (homedir, XSTRING (dir)->data, strlen (homedir))
! && IS_DIRECTORY_SEP (XSTRING (dir)->data[strlen (homedir)]))
{
! dir = make_string (XSTRING (dir)->data + strlen (homedir) - 1,
! STRING_BYTES (XSTRING (dir)) - strlen (homedir) + 1);
! XSTRING (dir)->data[0] = '~';
}
/* Likewise for default_filename. */
if (homedir != 0
&& STRINGP (default_filename)
! && !strncmp (homedir, XSTRING (default_filename)->data, strlen
(homedir))
! && IS_DIRECTORY_SEP (XSTRING (default_filename)->data[strlen
(homedir)]))
{
default_filename
! = make_string (XSTRING (default_filename)->data + strlen (homedir) - 1,
! STRING_BYTES (XSTRING (default_filename)) - strlen
(homedir) + 1);
! XSTRING (default_filename)->data[0] = '~';
}
if (!NILP (default_filename))
{
--- 6014,6036 ----
#endif
if (homedir != 0
&& STRINGP (dir)
! && !strncmp (homedir, SDATA (dir), strlen (homedir))
! && IS_DIRECTORY_SEP (SDATA (dir)[strlen (homedir)]))
{
! dir = make_string (SDATA (dir) + strlen (homedir) - 1,
! SBYTES (dir) - strlen (homedir) + 1);
! SREF (dir, 0) = '~';
}
/* Likewise for default_filename. */
if (homedir != 0
&& STRINGP (default_filename)
! && !strncmp (homedir, SDATA (default_filename), strlen (homedir))
! && IS_DIRECTORY_SEP (SDATA (default_filename)[strlen (homedir)]))
{
default_filename
! = make_string (SDATA (default_filename) + strlen (homedir) - 1,
! SBYTES (default_filename) - strlen (homedir) + 1);
! SREF (default_filename, 0) = '~';
}
if (!NILP (default_filename))
{
***************
*** 6048,6054 ****
args[0] = insdef;
args[1] = initial;
insdef = Fconcat (2, args);
! pos = make_number (XSTRING (double_dollars (dir))->size);
insdef = Fcons (double_dollars (insdef), pos);
}
else
--- 6048,6054 ----
args[0] = insdef;
args[1] = initial;
insdef = Fconcat (2, args);
! pos = make_number (SCHARS (double_dollars (dir)));
insdef = Fcons (double_dollars (insdef), pos);
}
else
***************
*** 6093,6099 ****
/* If DIR contains a file name, split it. */
Lisp_Object file;
file = Ffile_name_nondirectory (dir);
! if (XSTRING (file)->size && NILP (default_filename))
{
default_filename = file;
dir = Ffile_name_directory (dir);
--- 6093,6099 ----
/* If DIR contains a file name, split it. */
Lisp_Object file;
file = Ffile_name_nondirectory (dir);
! if (SCHARS (file) && NILP (default_filename))
{
default_filename = file;
dir = Ffile_name_directory (dir);
***************
*** 6137,6143 ****
if (!NILP (tem) && !NILP (default_filename))
val = default_filename;
! else if (XSTRING (val)->size == 0 && NILP (insdef))
{
if (!NILP (default_filename))
val = default_filename;
--- 6137,6143 ----
if (!NILP (tem) && !NILP (default_filename))
val = default_filename;
! else if (SCHARS (val) == 0 && NILP (insdef))
{
if (!NILP (default_filename))
val = default_filename;
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/10
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/11
- [Emacs-diffs] Changes to emacs/src/fileio.c, Richard M. Stallman, 2002/07/12
- [Emacs-diffs] Changes to emacs/src/fileio.c,
Ken Raeburn <=
- [Emacs-diffs] Changes to emacs/src/fileio.c, Ken Raeburn, 2002/07/16
- [Emacs-diffs] Changes to emacs/src/fileio.c, Ken Raeburn, 2002/07/16
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/19
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/19
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/19
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/19
- [Emacs-diffs] Changes to emacs/src/fileio.c, Juanma Barranquero, 2002/07/22
- [Emacs-diffs] Changes to emacs/src/fileio.c, Richard M. Stallman, 2002/07/28