diff options
author | Jim Meyering <jim@meyering.net> | 2006-08-15 19:17:30 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2006-08-15 19:17:30 +0000 |
commit | 2ee444b5fe414a627f8600cb3989b8eed1676b9f (patch) | |
tree | b109e89438ab841f4c23871d0ad242a9d4fcc3db /lib/fchmodat.c | |
parent | d8139747b188a142f388716b431e180faecd4f68 (diff) | |
download | coreutils-2ee444b5fe414a627f8600cb3989b8eed1676b9f.tar.xz |
[./]
* .x-sc_require_config_h: Add lib/at-func.c.
[lib/]
* at-func.c: New file, with the logic of all emulated at-functions.
* openat-priv.h: Include <errno.h> and define ENOSYS,
in support of the EXPECTED_ERRNO macro.
* openat.c (fstatat, unlinkat, fchownat): Remove function definitions.
Instead, define the appropriate symbols and include "at-func.c".
* mkdirat.c (mkdirat): Likewise.
* fchmodat.c (fchmodat): Likewise.
(ENOSYS): Remove definition.
* openat.c: Don't include <errno.h>, now that "openat-priv.h" does it.
Don't include "unistd--.h" -- it wasn't ever used.
[m4/]
* openat.m4 (gl_FUNC_OPENAT): Add at-func.c via AC_LIBSOURCES.
Diffstat (limited to 'lib/fchmodat.c')
-rw-r--r-- | lib/fchmodat.c | 74 |
1 files changed, 11 insertions, 63 deletions
diff --git a/lib/fchmodat.c b/lib/fchmodat.c index f8e84534a..62327f83e 100644 --- a/lib/fchmodat.c +++ b/lib/fchmodat.c @@ -22,30 +22,16 @@ #endif #include "openat.h" - -#include <errno.h> - #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "save-cwd.h" - -#include "gettext.h" -#define _(msgid) gettext (msgid) - #include "openat-priv.h" -/* Some systems don't have ENOSYS. */ -#ifndef ENOSYS -# ifdef ENOTSUP -# define ENOSYS ENOTSUP -# else -/* Some systems don't have ENOTSUP either. */ -# define ENOSYS EINVAL -# endif -#endif - #ifndef HAVE_LCHMOD +/* Use a different name, to avoid conflicting with any + system-supplied declaration. */ # undef lchmod -# define lchmod(f,m) (errno = ENOSYS, -1) +# define lchmod lchmod_rpl +static int lchmod (char const *f, mode_t m) { errno = ENOSYS; return -1; } #endif /* Solaris 10 has no function like this. @@ -56,49 +42,11 @@ fails, then give a diagnostic and exit nonzero. Note that an attempt to use a FLAG value of AT_SYMLINK_NOFOLLOW on a system without lchmod support causes this function to fail. */ -int -fchmodat (int fd, char const *file, mode_t mode, int flag) -{ - struct saved_cwd saved_cwd; - int saved_errno; - int err; - - if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) - return (flag == AT_SYMLINK_NOFOLLOW - ? lchmod (file, mode) - : chmod (file, mode)); - - { - char *proc_file; - BUILD_PROC_NAME (proc_file, fd, file); - err = (flag == AT_SYMLINK_NOFOLLOW - ? lchmod (proc_file, mode) - : chmod (proc_file, mode)); - /* If the syscall succeeds, or if it fails with an unexpected - errno value, then return right away. Otherwise, fall through - and resort to using save_cwd/restore_cwd. */ - if (0 <= err || ! EXPECTED_ERRNO (errno)) - return err; - } - - if (save_cwd (&saved_cwd) != 0) - openat_save_fail (errno); - - err = fchdir (fd); - saved_errno = errno; - - if (! err) - { - err = (flag == AT_SYMLINK_NOFOLLOW - ? lchmod (file, mode) - : chmod (file, mode)); - saved_errno = errno; - - if (restore_cwd (&saved_cwd) != 0) - openat_restore_fail (errno); - } - free_cwd (&saved_cwd); - errno = saved_errno; - return err; -} +#define AT_FUNC_NAME fchmodat +#define AT_FUNC_F1 lchmod +#define AT_FUNC_F2 chmod +#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW +#define AT_FUNC_POST_FILE_PARAM_DECLS , mode_t mode, int flag +#define AT_FUNC_POST_FILE_ARGS , mode +#include "at-func.c" |