[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: openat, fchmodat, mkdirat logic factored out...
|
From: |
Jim Meyering |
|
Subject: |
FYI: openat, fchmodat, mkdirat logic factored out... |
|
Date: |
Tue, 15 Aug 2006 21:23:07 +0200 |
Three of the functions in openat.c, plus those in fchmodat.c and mkdirat.c
all used the same logic. This change factors that into a new file,
at-func.c, which is then included by each of those three:
lib/ChangeLog | 13 +++
lib/at-func.c | 75 ++++++++++++++++++++
lib/fchmodat.c | 74 +++-----------------
lib/mkdirat.c | 57 +--------------
lib/openat-priv.h | 11 +++
lib/openat.c | 176 ++++++++++---------------------------------------
m4/ChangeLog | 4 +
m4/openat.m4 | 4 -
.x-sc_require_config_h | 1
ChangeLog | 2
10 files changed, 163 insertions(+), 254 deletions(-)
Index: lib/ChangeLog
===================================================================
RCS file: /fetish/cu/lib/ChangeLog,v
retrieving revision 1.1221
diff -u -p -r1.1221 ChangeLog
--- lib/ChangeLog 14 Aug 2006 16:20:49 -0000 1.1221
+++ lib/ChangeLog 15 Aug 2006 18:19:57 -0000
@@ -1,3 +1,16 @@
+2006-08-15 Jim Meyering <address@hidden>
+
+ * 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.
+
2006-08-14 Paul Eggert <address@hidden>
* memcoll.c (memcoll): Optimize for the common case where the
Index: lib/at-func.c
===================================================================
RCS file: lib/at-func.c
diff -N lib/at-func.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/at-func.c 15 Aug 2006 17:53:53 -0000
@@ -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
Index: lib/fchmodat.c
===================================================================
RCS file: /fetish/cu/lib/fchmodat.c,v
retrieving revision 1.1
diff -u -p -r1.1 fchmodat.c
--- lib/fchmodat.c 11 Jan 2006 13:30:31 -0000 1.1
+++ lib/fchmodat.c 15 Aug 2006 17:55:41 -0000
@@ -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"
Index: lib/mkdirat.c
===================================================================
RCS file: /fetish/cu/lib/mkdirat.c,v
retrieving revision 1.3
diff -u -p -r1.3 mkdirat.c
--- lib/mkdirat.c 3 Jan 2006 10:29:58 -0000 1.3
+++ lib/mkdirat.c 15 Aug 2006 17:55:41 -0000
@@ -23,17 +23,10 @@
#include "openat.h"
-#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
-#include <fcntl.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"
/* 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"
Index: lib/openat-priv.h
===================================================================
RCS file: /fetish/cu/lib/openat-priv.h,v
retrieving revision 1.2
diff -u -p -r1.2 openat-priv.h
--- lib/openat-priv.h 4 Dec 2005 22:00:14 -0000 1.2
+++ lib/openat-priv.h 15 Aug 2006 17:58:59 -0000
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#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
Index: lib/openat.c
===================================================================
RCS file: /fetish/cu/lib/openat.c,v
retrieving revision 1.28
diff -u -p -r1.28 openat.c
--- lib/openat.c 20 Jun 2006 19:20:25 -0000 1.28
+++ lib/openat.c 15 Aug 2006 18:17:23 -0000
@@ -25,21 +25,18 @@
#include <stdarg.h>
#include <stddef.h>
-#include <errno.h>
#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.
<http://www.google.com/search?q=openat+site:docs.sun.com>
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)
<http://www.google.com/search?q=fdopendir+site:docs.sun.com>
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)
<http://www.google.com/search?q=fstatat+site:docs.sun.com>
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.
<http://www.google.com/search?q=unlinkat+site:docs.sun.com>
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
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"
Index: m4/ChangeLog
===================================================================
RCS file: /fetish/cu/m4/ChangeLog,v
retrieving revision 1.854
diff -u -p -r1.854 ChangeLog
--- m4/ChangeLog 10 Aug 2006 19:26:39 -0000 1.854
+++ m4/ChangeLog 15 Aug 2006 18:21:42 -0000
@@ -1,3 +1,7 @@
+2006-08-15 Jim Meyering <address@hidden>
+
+ * openat.m4 (gl_FUNC_OPENAT): Add at-func.c via AC_LIBSOURCES.
+
2006-08-10 Jim Meyering <address@hidden>
Update from gnulib.
Index: m4/openat.m4
===================================================================
RCS file: /fetish/cu/m4/openat.m4,v
retrieving revision 1.10
diff -u -p -r1.10 openat.m4
--- m4/openat.m4 24 Jan 2006 19:13:41 -0000 1.10
+++ m4/openat.m4 15 Aug 2006 18:20:38 -0000
@@ -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 lo
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])
Index: ChangeLog
===================================================================
RCS file: /fetish/cu/ChangeLog,v
retrieving revision 1.1846
diff -u -p -r1.1846 ChangeLog
--- ChangeLog 15 Aug 2006 17:00:00 -0000 1.1846
+++ ChangeLog 15 Aug 2006 18:26:18 -0000
@@ -1,5 +1,7 @@
2006-08-15 Jim Meyering <address@hidden>
+ * .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.
Index: .x-sc_require_config_h
===================================================================
RCS file: /fetish/cu/.x-sc_require_config_h,v
retrieving revision 1.4
diff -u -p -r1.4 .x-sc_require_config_h
--- .x-sc_require_config_h 1 Jul 2006 06:50:30 -0000 1.4
+++ .x-sc_require_config_h 15 Aug 2006 18:25:47 -0000
@@ -1,3 +1,4 @@
+^lib/at-func\.c$
^lib/bcopy\.c$
^lib/buffer-lcm\.c$
^lib/c-strtold\.c$
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: openat, fchmodat, mkdirat logic factored out...,
Jim Meyering <=