From: Jim Meyering Date: Tue, 15 Aug 2006 19:17:30 +0000 (+0000) Subject: [./] X-Git-Tag: v6.1~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ee444b5fe414a627f8600cb3989b8eed1676b9f;p=thirdparty%2Fcoreutils.git [./] * .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 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 , 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. --- diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h index f82d7105a7..415a11365a 100644 --- a/.x-sc_require_config_h +++ b/.x-sc_require_config_h @@ -1,3 +1,4 @@ +^lib/at-func\.c$ ^lib/bcopy\.c$ ^lib/buffer-lcm\.c$ ^lib/c-strtold\.c$ diff --git a/ChangeLog b/ChangeLog index 8592bc37ab..d5c85f34b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-08-15 Jim Meyering + * .x-sc_require_config_h: Add lib/at-func.c. + * NEWS: Add a line for 6.1-cvs. * configure.ac (AC_INIT): Bump to 6.1 and add "-cvs" suffix. diff --git a/lib/ChangeLog b/lib/ChangeLog index 2d2203ea86..84d50069de 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,16 @@ +2006-08-15 Jim Meyering + + * at-func.c: New file, with the logic of all emulated at-functions. + * openat-priv.h: Include 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 , now that "openat-priv.h" does it. + Don't include "unistd--.h" -- it wasn't ever used. + 2006-08-14 Paul Eggert * memcoll.c (memcoll): Optimize for the common case where the diff --git a/lib/at-func.c b/lib/at-func.c new file mode 100644 index 0000000000..2bdea7b935 --- /dev/null +++ b/lib/at-func.c @@ -0,0 +1,75 @@ +/* Define an at-style functions like fstatat, unlinkat, fchownat, etc. + Copyright (C) 2006 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 2, 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, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* written by Jim Meyering */ + +#define CALL_FUNC(F) \ + (AT_FUNC_USE_F1_COND \ + ? AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS) \ + : AT_FUNC_F2 (F AT_FUNC_POST_FILE_ARGS)) + +/* Call AT_FUNC_F1 or AT_FUNC_F2 (testing AT_FUNC_USE_F1_COND to + determine which) to operate on FILE, which is in the directory + open on descriptor FD. If possible, do it without changing the + working directory. Otherwise, resort to using save_cwd/fchdir, + then AT_FUNC_F?/restore_cwd. If either the save_cwd or the restore_cwd + fails, then give a diagnostic and exit nonzero. */ +int +AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS) +{ + struct saved_cwd saved_cwd; + int saved_errno; + int err; + + if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) + return CALL_FUNC (file); + + { + char *proc_file; + BUILD_PROC_NAME (proc_file, fd, file); + err = CALL_FUNC (proc_file); + /* 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); + + if (fchdir (fd) != 0) + { + saved_errno = errno; + free_cwd (&saved_cwd); + errno = saved_errno; + return -1; + } + + err = CALL_FUNC (file); + saved_errno = (err < 0 ? errno : 0); + + if (restore_cwd (&saved_cwd) != 0) + openat_restore_fail (errno); + + free_cwd (&saved_cwd); + + if (saved_errno) + errno = saved_errno; + return err; +} +#undef CALL_FUNC diff --git a/lib/fchmodat.c b/lib/fchmodat.c index f8e84534aa..62327f83e7 100644 --- a/lib/fchmodat.c +++ b/lib/fchmodat.c @@ -22,30 +22,16 @@ #endif #include "openat.h" - -#include - #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" diff --git a/lib/mkdirat.c b/lib/mkdirat.c index 6103c6f157..dc75eb12e8 100644 --- a/lib/mkdirat.c +++ b/lib/mkdirat.c @@ -23,17 +23,10 @@ #include "openat.h" -#include #include -#include -#include #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" /* Solaris 10 has no function like this. @@ -42,47 +35,11 @@ working directory. Otherwise, resort to using save_cwd/fchdir, then mkdir/restore_cwd. If either the save_cwd or the restore_cwd fails, then give a diagnostic and exit nonzero. */ -int -mkdirat (int fd, char const *file, mode_t mode) -{ - struct saved_cwd saved_cwd; - int saved_errno; - int err; - - if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) - return mkdir (file, mode); - - { - char *proc_file; - BUILD_PROC_NAME (proc_file, fd, file); - err = mkdir (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); - - if (fchdir (fd) != 0) - { - saved_errno = errno; - free_cwd (&saved_cwd); - errno = saved_errno; - return -1; - } - - err = mkdir (file, mode); - saved_errno = (err < 0 ? errno : 0); - - if (restore_cwd (&saved_cwd) != 0) - openat_restore_fail (errno); - - free_cwd (&saved_cwd); - if (saved_errno) - errno = saved_errno; - return err; -} +#define AT_FUNC_NAME mkdirat +#define AT_FUNC_F1 mkdir +#define AT_FUNC_F2 mkdir +#define AT_FUNC_USE_F1_COND 1 +#define AT_FUNC_POST_FILE_PARAM_DECLS , mode_t mode +#define AT_FUNC_POST_FILE_ARGS , mode +#include "at-func.c" diff --git a/lib/openat-priv.h b/lib/openat-priv.h index 2b4780eecf..1f420c1754 100644 --- a/lib/openat-priv.h +++ b/lib/openat-priv.h @@ -19,6 +19,7 @@ #include #include +#include #include "alloca.h" #include "intprops.h" @@ -41,6 +42,16 @@ } \ while (0) +/* 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 + /* Trying to access a BUILD_PROC_NAME file will fail on systems without /proc support, and even on systems *with* ProcFS support. Return nonzero if the failure may be legitimate, e.g., because /proc is not diff --git a/lib/openat.c b/lib/openat.c index 7df52ea132..ca71d658e8 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -25,21 +25,18 @@ #include #include -#include #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "fcntl--.h" #include "lstat.h" #include "openat-priv.h" #include "save-cwd.h" -#include "unistd--.h" /* Replacement for Solaris' openat function. First, try to simulate it via open ("/proc/self/fd/FD/FILE"). Failing that, simulate it by doing save_cwd/fchdir/open/restore_cwd. - If either the save_cwd or the restore_cwd fails (relatively unlikely, - and usually indicative of a problem that deserves close attention), + If either the save_cwd or the restore_cwd fails (relatively unlikely), then give a diagnostic and exit nonzero. Otherwise, upon failure, set errno and return -1, as openat does. Upon successful completion, return a file descriptor. */ @@ -154,8 +151,7 @@ openat_needs_fchdir (void) First, try to simulate it via opendir ("/proc/self/fd/FD"). Failing that, simulate it by doing save_cwd/fchdir/opendir(".")/restore_cwd. - If either the save_cwd or the restore_cwd fails (relatively unlikely, - and usually indicative of a problem that deserves close attention), + If either the save_cwd or the restore_cwd fails (relatively unlikely), then give a diagnostic and exit nonzero. Otherwise, this function works just like Solaris' fdopendir. @@ -211,105 +207,45 @@ fdopendir (int fd) First, try to simulate it via l?stat ("/proc/self/fd/FD/FILE"). Failing that, simulate it via save_cwd/fchdir/(stat|lstat)/restore_cwd. - If either the save_cwd or the restore_cwd fails (relatively unlikely, - and usually indicative of a problem that deserves close attention), + If either the save_cwd or the restore_cwd fails (relatively unlikely), then give a diagnostic and exit nonzero. Otherwise, this function works just like Solaris' fstatat. */ -int -fstatat (int fd, char const *file, struct stat *st, 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 - ? lstat (file, st) - : stat (file, st)); - - { - char *proc_file; - BUILD_PROC_NAME (proc_file, fd, file); - err = (flag == AT_SYMLINK_NOFOLLOW - ? lstat (proc_file, st) - : stat (proc_file, st)); - /* 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 - ? lstat (file, st) - : stat (file, st)); - 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 fstatat +#define AT_FUNC_F1 lstat +#define AT_FUNC_F2 stat +#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW +#define AT_FUNC_POST_FILE_PARAM_DECLS , struct stat *st, int flag +#define AT_FUNC_POST_FILE_ARGS , st +#include "at-func.c" +#undef AT_FUNC_NAME +#undef AT_FUNC_F1 +#undef AT_FUNC_F2 +#undef AT_FUNC_USE_F1_COND +#undef AT_FUNC_POST_FILE_PARAM_DECLS +#undef AT_FUNC_POST_FILE_ARGS /* Replacement for Solaris' function by the same name. First, try to simulate it via (unlink|rmdir) ("/proc/self/fd/FD/FILE"). Failing that, simulate it via save_cwd/fchdir/(unlink|rmdir)/restore_cwd. - If either the save_cwd or the restore_cwd fails (relatively unlikely, - and usually indicative of a problem that deserves close attention), + If either the save_cwd or the restore_cwd fails (relatively unlikely), then give a diagnostic and exit nonzero. Otherwise, this function works just like Solaris' unlinkat. */ -int -unlinkat (int fd, char const *file, int flag) -{ - struct saved_cwd saved_cwd; - int saved_errno; - int err; - if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file)) - return (flag == AT_REMOVEDIR ? rmdir (file) : unlink (file)); - - { - char *proc_file; - BUILD_PROC_NAME (proc_file, fd, file); - err = (flag == AT_REMOVEDIR ? rmdir (proc_file) : unlink (proc_file)); - /* 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_REMOVEDIR ? rmdir (file) : unlink (file)); - 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 unlinkat +#define AT_FUNC_F1 rmdir +#define AT_FUNC_F2 unlink +#define AT_FUNC_USE_F1_COND flag == AT_REMOVEDIR +#define AT_FUNC_POST_FILE_PARAM_DECLS , int flag +#define AT_FUNC_POST_FILE_ARGS /* empty */ +#include "at-func.c" +#undef AT_FUNC_NAME +#undef AT_FUNC_F1 +#undef AT_FUNC_F2 +#undef AT_FUNC_USE_F1_COND +#undef AT_FUNC_POST_FILE_PARAM_DECLS +#undef AT_FUNC_POST_FILE_ARGS /* Replacement for Solaris' function by the same name. Invoke chown or lchown on file, FILE, using OWNER and GROUP, in the @@ -318,49 +254,11 @@ unlinkat (int fd, char const *file, int flag) the working directory. Otherwise, resort to using save_cwd/fchdir, then mkdir/restore_cwd. If either the save_cwd or the restore_cwd fails, then give a diagnostic and exit nonzero. */ -int -fchownat (int fd, char const *file, uid_t owner, gid_t group, 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 - ? lchown (file, owner, group) - : chown (file, owner, group)); - - { - char *proc_file; - BUILD_PROC_NAME (proc_file, fd, file); - err = (flag == AT_SYMLINK_NOFOLLOW - ? lchown (proc_file, owner, group) - : chown (proc_file, owner, group)); - /* 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 - ? lchown (file, owner, group) - : chown (file, owner, group)); - 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 fchownat +#define AT_FUNC_F1 lchown +#define AT_FUNC_F2 chown +#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW +#define AT_FUNC_POST_FILE_PARAM_DECLS , uid_t owner, gid_t group, int flag +#define AT_FUNC_POST_FILE_ARGS , owner, group +#include "at-func.c" diff --git a/m4/ChangeLog b/m4/ChangeLog index f5c55d13dc..d225958c78 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2006-08-15 Jim Meyering + + * openat.m4 (gl_FUNC_OPENAT): Add at-func.c via AC_LIBSOURCES. + 2006-08-10 Jim Meyering Update from gnulib. diff --git a/m4/openat.m4 b/m4/openat.m4 index 9879a01121..0abb8c87d3 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,4 +1,4 @@ -#serial 8 +#serial 9 # See if we need to use our replacement for Solaris' openat et al functions. dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_OPENAT], [ - AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c]) + AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c, at-func.c]) AC_LIBSOURCES([intprops.h]) AC_LIBSOURCES([mkdirat.c]) AC_LIBSOURCES([fchmodat.c])