diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/fileio.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 70f6fb7469f..8e208565bde 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-04 Paul Eggert <eggert@cs.ucla.edu> + + * fileio.c (barf_or_query_if_file_exists): Use S_ISDIR. + This is more efficient than Ffile_directory_p and avoids a minor race. + 2011-07-04 Lars Magne Ingebrigtsen <larsi@gnus.org> * buffer.c (Foverlay_put): Say what the return value is diff --git a/src/fileio.c b/src/fileio.c index 68834d5b5ec..c6f8dfe4683 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1755,7 +1755,7 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring, regardless of what access permissions it has. */ if (lstat (SSDATA (encoded_filename), &statbuf) >= 0) { - if (Ffile_directory_p (absname)) + if (S_ISDIR (statbuf.st_mode)) xsignal2 (Qfile_error, build_string ("File is a directory"), absname); |