summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-12-17 06:55:01 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-12-17 06:55:01 +0000
commit1c5cebe7033a90f4350ddb794f905dce68f2d6b8 (patch)
tree31809fba115cf188d45318a9abc2f25022149bec /lib
parent0ae5a45fcb88256c0a3fce26c2cb3ab643f1a941 (diff)
downloadcoreutils-1c5cebe7033a90f4350ddb794f905dce68f2d6b8.tar.xz
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/openat.h51
1 files changed, 26 insertions, 25 deletions
diff --git a/lib/openat.h b/lib/openat.h
index 479823de1..15b1d9df8 100644
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -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 */
+/* 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
+
+#ifdef __OPENAT_PREFIX
-# 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)
+# 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
+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)
+# define fstatat __OPENAT_ID (fstatat)
int fstatat (int fd, char const *file, struct stat *st, int flag);
-# define unlinkat __OPENAT_ID (unlinkat)
+# 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
-#endif
+#else
+
+# define openat_permissive(Fd, File, Flags, Mode, Cwd_errno) \
+ openat (Fd, File, Flags, Mode)
-#ifndef openat_ro
-# define openat_ro(Fd, File, Flags, RF) openat (Fd, File, Flags)
#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;