mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
Revamp code so that function macros depend on
__OPENAT_PREFIX only, not also on AT_FDCWD. (openat_ro): Remove. Caller changed to use openat_permissive. (openat_permissive): Now a macro, if not a function. (openat_restore_fail, openat_save_fail): Now always functions, since mkdirat needs them even if __OPENAT_PREFIX is defined.
This commit is contained in:
1 parent
0ae5a45fcb
commit
1c5cebe703
1 file changed
+31
-30
+31
-30
@@ -36,38 +36,39 @@
|
||||
#endif
|
||||
|
||||
#ifndef AT_FDCWD
|
||||
# define AT_FDCWD (-3041965) /* same value as Solaris 9 */
|
||||
# define AT_SYMLINK_NOFOLLOW 4096 /* same value as Solaris 9 */
|
||||
# define AT_REMOVEDIR (0x1) /* same value as Solaris 9 */
|
||||
|
||||
# ifdef __OPENAT_PREFIX
|
||||
# undef openat
|
||||
# define __OPENAT_CONCAT(x, y) x ## y
|
||||
# define __OPENAT_XCONCAT(x, y) __OPENAT_CONCAT (x, y)
|
||||
# define __OPENAT_ID(y) __OPENAT_XCONCAT (__OPENAT_PREFIX, y)
|
||||
# define openat __OPENAT_ID (openat)
|
||||
int openat (int fd, char const *file, int flags, /* mode_t mode */ ...);
|
||||
int openat_permissive (int fd, char const *file, int flags, bool *restore_failed, ...);
|
||||
# if ! HAVE_FDOPENDIR
|
||||
# define fdopendir __OPENAT_ID (fdopendir)
|
||||
# endif
|
||||
DIR *fdopendir (int fd);
|
||||
# define fstatat __OPENAT_ID (fstatat)
|
||||
int fstatat (int fd, char const *file, struct stat *st, int flag);
|
||||
# define unlinkat __OPENAT_ID (unlinkat)
|
||||
int unlinkat (int fd, char const *file, int flag);
|
||||
void openat_restore_fail (int) ATTRIBUTE_NORETURN;
|
||||
void openat_save_fail (int) ATTRIBUTE_NORETURN;
|
||||
# define openat_ro(Fd, File, Flags, RF) openat_permissive (Fd, File, Flags, RF)
|
||||
# else
|
||||
# define openat_restore_fail(Errno) /* empty */
|
||||
# define openat_save_fail(Errno) /* empty */
|
||||
# endif
|
||||
|
||||
/* Use the same values as Solaris 9. This shouldn't matter, but
|
||||
there's no real reason to differ. */
|
||||
# define AT_FDCWD (-3041965)
|
||||
# define AT_SYMLINK_NOFOLLOW 4096
|
||||
# define AT_REMOVEDIR 1
|
||||
#endif
|
||||
|
||||
#ifndef openat_ro
|
||||
# define openat_ro(Fd, File, Flags, RF) openat (Fd, File, Flags)
|
||||
#ifdef __OPENAT_PREFIX
|
||||
|
||||
# undef openat
|
||||
# define __OPENAT_CONCAT(x, y) x ## y
|
||||
# define __OPENAT_XCONCAT(x, y) __OPENAT_CONCAT (x, y)
|
||||
# define __OPENAT_ID(y) __OPENAT_XCONCAT (__OPENAT_PREFIX, y)
|
||||
# define openat __OPENAT_ID (openat)
|
||||
int openat (int fd, char const *file, int flags, /* mode_t mode */ ...);
|
||||
int openat_permissive (int fd, char const *file, int flags, mode_t mode,
|
||||
int *cwd_errno);
|
||||
# if ! HAVE_FDOPENDIR
|
||||
# define fdopendir __OPENAT_ID (fdopendir)
|
||||
# endif
|
||||
DIR *fdopendir (int fd);
|
||||
# define fstatat __OPENAT_ID (fstatat)
|
||||
int fstatat (int fd, char const *file, struct stat *st, int flag);
|
||||
# define unlinkat __OPENAT_ID (unlinkat)
|
||||
int unlinkat (int fd, char const *file, int flag);
|
||||
|
||||
#else
|
||||
|
||||
# define openat_permissive(Fd, File, Flags, Mode, Cwd_errno) \
|
||||
openat (Fd, File, Flags, Mode)
|
||||
|
||||
#endif
|
||||
|
||||
int mkdirat (int fd, char const *file, mode_t mode);
|
||||
void openat_restore_fail (int) ATTRIBUTE_NORETURN;
|
||||
void openat_save_fail (int) ATTRIBUTE_NORETURN;
|
||||
Reference in new issue
Block a user