diff options
| author | Paul Eggert | 2013-01-31 22:30:51 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-31 22:30:51 -0800 |
| commit | 8654f9d7d6d7c3ee97232a34a40250dcbc57af8e (patch) | |
| tree | ff488081b57dabdfe7e85c11a34e8ac522b5bdb4 /lib/readlinkat.c | |
| parent | 44b12dd6994a6214b9d6f73539b441080611369b (diff) | |
| download | emacs-8654f9d7d6d7c3ee97232a34a40250dcbc57af8e.tar.gz emacs-8654f9d7d6d7c3ee97232a34a40250dcbc57af8e.zip | |
Use fdopendir, fstatat and readlinkat, for efficiency.
On my host, this speeds up directory-files-and-attributes by a
factor of 3, when applied to Emacs's src directory.
These functions are standardized by POSIX and are common these
days; fall back on a (slower) gnulib implementation if the host
is too old to supply them.
* .bzrignore: Add lib/dirent.h.
* lib/Makefile.am (libgnu_a_SOURCES): Add openat-die.c, save-cwd.c.
* lib/careadlinkat.c, lib/careadlinkat.h: Merge from gnulib,
incorporating: 2013-01-29 careadlinkat: do not provide careadlinkatcwd.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/dirent.in.h, lib/fdopendir.c, lib/fstatat.c, lib/openat-priv.h:
* lib/openat-proc.c, lib/openat.h, m4/dirent_h.m4, m4/fdopendir.m4:
* m4/fstatat.m4: New files, from gnulib.
* lib/openat-die.c, lib/save-cwd.c, lib/save-cwd.h: New files.
These last three are specific to Emacs and are not copied from gnulib.
They are simpler than the gnulib versions and are tuned for Emacs.
* admin/merge-gnulib (GNULIB_MODULES): Add fdopendir, fstatat, readlinkat.
(GNULIB_TOOL_FLAGS): Do not avoid at-internal, openat-h.
Avoid dup, open, opendir.
* nt/inc/sys/stat.h (fstatat):
* nt/inc/unistd.h (readlinkat): New decls.
* src/conf_post.h (GNULIB_SUPPORT_ONLY_AT_FDCWD): Remove.
* src/dired.c: Include <fcntl.h>.
(open_directory): New function, which uses open and fdopendir
rather than opendir. DOS_NT platforms still use opendir, though.
(directory_files_internal, file_name_completion): Use it.
(file_attributes): New function, with most of the old Ffile_attributes.
(directory_files_internal, Ffile_attributes): Use it.
(file_attributes, file_name_completion_stat): First arg is now fd,
not dir name. All uses changed. Use fstatat rather than lstat +
stat.
(file_attributes): Use emacs_readlinkat rather than Ffile_symlink_p.
* src/fileio.c: Include <allocator.h>, <careadlinkat.h>.
(emacs_readlinkat): New function, with much of the old
Ffile_symlink_p, but with an fd argument for speed.
It uses readlinkat rather than careadlinkatcwd, so that it
need not assume the working directory.
(Ffile_symlink_p): Use it.
* src/filelock.c (current_lock_owner): Use emacs_readlinkat
rather than emacs_readlink.
* src/lisp.h (emacs_readlinkat): New decl.
(READLINK_BUFSIZE, emacs_readlink): Remove.
* src/sysdep.c: Do not include <allocator.h>, <careadlinkat.h>.
(emacs_norealloc_allocator, emacs_readlink): Remove.
This stuff is moved to fileio.c.
* src/w32.c (fstatat, readlinkat): New functions.
(careadlinkat): Don't check that fd == AT_FDCWD.
(careadlinkatcwd): Remove; no longer needed.
Fixes: debbugs:13539
Diffstat (limited to 'lib/readlinkat.c')
| -rw-r--r-- | lib/readlinkat.c | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/lib/readlinkat.c b/lib/readlinkat.c new file mode 100644 index 00000000000..504e6ebbc49 --- /dev/null +++ b/lib/readlinkat.c | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* Read a symlink relative to an open directory. | ||
| 2 | Copyright (C) 2009-2013 Free Software Foundation, Inc. | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation; either version 3 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| 16 | |||
| 17 | /* written by Eric Blake */ | ||
| 18 | |||
| 19 | #include <config.h> | ||
| 20 | |||
| 21 | #include <unistd.h> | ||
| 22 | |||
| 23 | /* Gnulib provides a readlink stub for mingw; use it for distinction | ||
| 24 | between EINVAL and ENOENT, rather than always failing with ENOSYS. */ | ||
| 25 | |||
| 26 | /* POSIX 2008 says that unlike readlink, readlinkat returns 0 for | ||
| 27 | success instead of the buffer length. But this would render | ||
| 28 | readlinkat worthless since readlink does not guarantee a | ||
| 29 | NUL-terminated buffer. Assume this was a bug in POSIX. */ | ||
| 30 | |||
| 31 | /* Read the contents of symlink FILE into buffer BUF of size LEN, in the | ||
| 32 | directory open on descriptor FD. If possible, do it without changing | ||
| 33 | the working directory. Otherwise, resort to using save_cwd/fchdir, | ||
| 34 | then readlink/restore_cwd. If either the save_cwd or the restore_cwd | ||
| 35 | fails, then give a diagnostic and exit nonzero. */ | ||
| 36 | |||
| 37 | #define AT_FUNC_NAME readlinkat | ||
| 38 | #define AT_FUNC_F1 readlink | ||
| 39 | #define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len | ||
| 40 | #define AT_FUNC_POST_FILE_ARGS , buf, len | ||
| 41 | #define AT_FUNC_RESULT ssize_t | ||
| 42 | #include "at-func.c" | ||
| 43 | #undef AT_FUNC_NAME | ||
| 44 | #undef AT_FUNC_F1 | ||
| 45 | #undef AT_FUNC_POST_FILE_PARAM_DECLS | ||
| 46 | #undef AT_FUNC_POST_FILE_ARGS | ||
| 47 | #undef AT_FUNC_RESULT | ||