mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-01 03:11:09 -08: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
116 lines
3.3 KiB
C
116 lines
3.3 KiB
C
/* sys/stat.h supplied with MSVCRT uses too narrow data types for
|
|
inode and user/group id, so we replace them with our own.
|
|
|
|
Copyright (C) 2008-2013 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs 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.
|
|
|
|
GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef INC_SYS_STAT_H_
|
|
#define INC_SYS_STAT_H_
|
|
|
|
#ifdef __MINGW32__
|
|
# include <_mingw.h>
|
|
#endif
|
|
|
|
/* Only MinGW 3.13 and later has __MINGW_NOTHROW. */
|
|
#ifndef __MINGW_NOTHROW
|
|
# define __MINGW_NOTHROW
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
#include <time.h>
|
|
|
|
#define S_IFMT 0xF800
|
|
|
|
#define S_IFREG 0x8000
|
|
#define S_IFDIR 0x4000
|
|
#define S_IFBLK 0x3000
|
|
#define S_IFCHR 0x2000
|
|
#define S_IFIFO 0x1000
|
|
#define S_IFLNK 0x0800
|
|
|
|
#define S_IREAD 0x0100
|
|
#define S_IWRITE 0x0080
|
|
#define S_IEXEC 0x0040
|
|
|
|
#define S_IRUSR S_IREAD
|
|
#define S_IWUSR S_IWRITE
|
|
#define S_IXUSR S_IEXEC
|
|
#define S_IRWXU (S_IREAD | S_IWRITE | S_IEXEC)
|
|
|
|
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
|
|
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
|
#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
|
|
#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
|
|
#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
|
|
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
|
|
|
|
/* These don't exist on Windows, but lib/filemode.c wants them. */
|
|
#define S_ISUID 0
|
|
#define S_ISGID 0
|
|
#define S_ISVTX 0
|
|
#define S_IRGRP (S_IRUSR >> 3)
|
|
#define S_IROTH (S_IRUSR >> 6)
|
|
#define S_IWGRP (S_IWUSR >> 3)
|
|
#define S_IWOTH (S_IWUSR >> 6)
|
|
#define S_IXGRP (S_IXUSR >> 3)
|
|
#define S_IXOTH (S_IXUSR >> 6)
|
|
|
|
#define S_ISSOCK(m) 0
|
|
#define S_ISCTG(p) 0
|
|
#define S_ISDOOR(m) 0
|
|
#define S_ISMPB(m) 0
|
|
#define S_ISMPC(m) 0
|
|
#define S_ISMPX(m) 0
|
|
#define S_ISNWK(m) 0
|
|
#define S_ISPORT(m) 0
|
|
#define S_ISWHT(m) 0
|
|
#define S_TYPEISMQ(p) 0
|
|
#define S_TYPEISSEM(p) 0
|
|
#define S_TYPEISSHM(p) 0
|
|
#define S_TYPEISTMO(p) 0
|
|
|
|
struct stat {
|
|
unsigned __int64 st_ino; /* ino_t in sys/types.h is too narrow */
|
|
dev_t st_dev;
|
|
unsigned short st_mode;
|
|
short st_nlink;
|
|
unsigned st_uid; /* Vista's TrustedInstaller has a very large RID */
|
|
unsigned st_gid;
|
|
unsigned __int64 st_size;
|
|
dev_t st_rdev;
|
|
time_t st_atime;
|
|
time_t st_mtime;
|
|
time_t st_ctime;
|
|
char st_uname[260];
|
|
char st_gname[260];
|
|
};
|
|
|
|
/* Internal variable for asking 'stat'/'lstat' to produce accurate
|
|
info about owner and group of files. */
|
|
extern int w32_stat_get_owner_group;
|
|
|
|
/* Prevent redefinition by other headers, e.g. wchar.h. */
|
|
#define _STAT_DEFINED
|
|
|
|
_CRTIMP int __cdecl __MINGW_NOTHROW fstat (int, struct stat*);
|
|
_CRTIMP int __cdecl __MINGW_NOTHROW chmod (const char*, int);
|
|
_CRTIMP int __cdecl __MINGW_NOTHROW stat (const char*, struct stat*);
|
|
_CRTIMP int __cdecl __MINGW_NOTHROW lstat (const char*, struct stat*);
|
|
_CRTIMP int __cdecl __MINGW_NOTHROW fstatat (int, char const *,
|
|
struct stat *, int);
|
|
|
|
#endif /* INC_SYS_STAT_H_ */
|