mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
8654f9d7d6
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
121 lines
2.9 KiB
C
121 lines
2.9 KiB
C
/* provide a replacement openat function
|
|
Copyright (C) 2004-2006, 2008-2013 Free Software Foundation, Inc.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* written by Jim Meyering */
|
|
|
|
#ifndef _GL_HEADER_OPENAT
|
|
#define _GL_HEADER_OPENAT
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <stdbool.h>
|
|
|
|
_GL_INLINE_HEADER_BEGIN
|
|
|
|
#if !HAVE_OPENAT
|
|
|
|
int openat_permissive (int fd, char const *file, int flags, mode_t mode,
|
|
int *cwd_errno);
|
|
bool openat_needs_fchdir (void);
|
|
|
|
#else
|
|
|
|
# define openat_permissive(Fd, File, Flags, Mode, Cwd_errno) \
|
|
openat (Fd, File, Flags, Mode)
|
|
# define openat_needs_fchdir() false
|
|
|
|
#endif
|
|
|
|
_Noreturn void openat_restore_fail (int);
|
|
_Noreturn void openat_save_fail (int);
|
|
|
|
/* Using these function names makes application code
|
|
slightly more readable than it would be with
|
|
fchownat (..., 0) or fchownat (..., AT_SYMLINK_NOFOLLOW). */
|
|
|
|
#if GNULIB_FCHOWNAT
|
|
|
|
# ifndef FCHOWNAT_INLINE
|
|
# define FCHOWNAT_INLINE _GL_INLINE
|
|
# endif
|
|
|
|
FCHOWNAT_INLINE int
|
|
chownat (int fd, char const *file, uid_t owner, gid_t group)
|
|
{
|
|
return fchownat (fd, file, owner, group, 0);
|
|
}
|
|
|
|
FCHOWNAT_INLINE int
|
|
lchownat (int fd, char const *file, uid_t owner, gid_t group)
|
|
{
|
|
return fchownat (fd, file, owner, group, AT_SYMLINK_NOFOLLOW);
|
|
}
|
|
|
|
#endif
|
|
|
|
#if GNULIB_FCHMODAT
|
|
|
|
# ifndef FCHMODAT_INLINE
|
|
# define FCHMODAT_INLINE _GL_INLINE
|
|
# endif
|
|
|
|
FCHMODAT_INLINE int
|
|
chmodat (int fd, char const *file, mode_t mode)
|
|
{
|
|
return fchmodat (fd, file, mode, 0);
|
|
}
|
|
|
|
FCHMODAT_INLINE int
|
|
lchmodat (int fd, char const *file, mode_t mode)
|
|
{
|
|
return fchmodat (fd, file, mode, AT_SYMLINK_NOFOLLOW);
|
|
}
|
|
|
|
#endif
|
|
|
|
#if GNULIB_STATAT
|
|
|
|
# ifndef STATAT_INLINE
|
|
# define STATAT_INLINE _GL_INLINE
|
|
# endif
|
|
|
|
STATAT_INLINE int
|
|
statat (int fd, char const *name, struct stat *st)
|
|
{
|
|
return fstatat (fd, name, st, 0);
|
|
}
|
|
|
|
STATAT_INLINE int
|
|
lstatat (int fd, char const *name, struct stat *st)
|
|
{
|
|
return fstatat (fd, name, st, AT_SYMLINK_NOFOLLOW);
|
|
}
|
|
|
|
#endif
|
|
|
|
/* For now, there are no wrappers named laccessat or leuidaccessat,
|
|
since gnulib doesn't support faccessat(,AT_SYMLINK_NOFOLLOW) and
|
|
since access rights on symlinks are of limited utility. Likewise,
|
|
wrappers are not provided for accessat or euidaccessat, so as to
|
|
avoid dragging in -lgen on some platforms. */
|
|
|
|
_GL_INLINE_HEADER_END
|
|
|
|
#endif /* _GL_HEADER_OPENAT */
|