[src/trunk]: src/tools/compat Implement replacements for lchflags(), lchmod()...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42bd50112b9d
branches:  trunk
changeset: 537900:42bd50112b9d
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Oct 08 00:28:36 2002 +0000

description:
Implement replacements for lchflags(), lchmod(), and lchown(),
which first lstat(2) the target and return EINVAL if it's a symlink,
and then call ch{flags,mod,own} as appropriate.
Removes the need for hokey code inside the tools themselves...

diffstat:

 tools/compat/Makefile      |   5 ++-
 tools/compat/compat_defs.h |  14 +++++++++-
 tools/compat/lchflags.c    |  62 ++++++++++++++++++++++++++++++++++++++++++++++
 tools/compat/lchmod.c      |  62 ++++++++++++++++++++++++++++++++++++++++++++++
 tools/compat/lchown.c      |  62 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 202 insertions(+), 3 deletions(-)

diffs (242 lines):

diff -r 8410cee5e5f3 -r 42bd50112b9d tools/compat/Makefile
--- a/tools/compat/Makefile     Mon Oct 07 23:23:53 2002 +0000
+++ b/tools/compat/Makefile     Tue Oct 08 00:28:36 2002 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.16 2002/10/06 12:09:34 lukem Exp $
+#      $NetBSD: Makefile,v 1.17 2002/10/08 00:28:36 lukem Exp $
 
 HOSTLIB=       nbcompat
 
 SRCS=          basename.c dirname.c fgetln.c flock.c fparseln.c \
-               getmode.c getopt_long.c gettemp.c issetugid.c libyywrap.c \
+               getmode.c getopt_long.c gettemp.c issetugid.c \
+               lchflags.c lchmod.c lchown.c libyywrap.c \
                md2c.c md2hl.c md4c.c md4hl.c md5c.c md5hl.c mkdtemp.c \
                mkstemp.c pread.c pwcache.c pwrite.c pw_scan.c rmd160.c \
                rmd160hl.c setenv.c setgroupent.c setpassent.c setprogname.c \
diff -r 8410cee5e5f3 -r 42bd50112b9d tools/compat/compat_defs.h
--- a/tools/compat/compat_defs.h        Mon Oct 07 23:23:53 2002 +0000
+++ b/tools/compat/compat_defs.h        Tue Oct 08 00:28:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_defs.h,v 1.20 2002/10/06 12:09:34 lukem Exp $   */
+/*     $NetBSD: compat_defs.h,v 1.21 2002/10/08 00:28:36 lukem Exp $   */
 
 #ifndef        __NETBSD_COMPAT_DEFS_H__
 #define        __NETBSD_COMPAT_DEFS_H__
@@ -178,6 +178,18 @@
 #define isblank(x) ((x) == ' ' || (x) == '\t')
 #endif
 
+#if !HAVE_LCHFLAGS
+int lchflags(const char *, u_long);
+#endif
+
+#if !HAVE_LCHMOD
+int lchmod(const char *, mode_t);
+#endif
+
+#if !HAVE_LCHOWN
+int lchown(const char *, uid_t, gid_t);
+#endif
+
 #if !HAVE_MACHINE_BSWAP_H
 #define bswap16(x)     ((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff))
 
diff -r 8410cee5e5f3 -r 42bd50112b9d tools/compat/lchflags.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/compat/lchflags.c   Tue Oct 08 00:28:36 2002 +0000
@@ -0,0 +1,62 @@
+/*     $NetBSD: lchflags.c,v 1.1 2002/10/08 00:28:36 lukem Exp $       */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Emulate lchflags(2), checking path with lstat(2) first to ensure that
+ * it's not a symlink, and then call chflags(2) */
+
+#include "config.h"
+
+#if !HAVE_LCHFLAGS && HAVE_STRUCT_STAT_ST_FLAGS
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
+
+int
+lchflags(const char *path, u_long flags)
+{
+       struct stat psb;
+
+       if (lstat(path, &psb) == -1)
+               return -1;
+       if (S_ISLNK(psb.st_mode)) {
+               errno = EINVAL;
+               return -1;
+       }
+       return (chflags(path, flags));
+}
+#endif
diff -r 8410cee5e5f3 -r 42bd50112b9d tools/compat/lchmod.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/compat/lchmod.c     Tue Oct 08 00:28:36 2002 +0000
@@ -0,0 +1,62 @@
+/*     $NetBSD: lchmod.c,v 1.1 2002/10/08 00:28:36 lukem Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Emulate lchmod(2), checking path with lstat(2) first to ensure that
+ * it's not a symlink, and then call chmod(2) */
+
+#include "config.h"
+
+#if !HAVE_LCHMOD
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
+
+int
+lchmod(const char *path, mode_t mode)
+{
+       struct stat psb;
+
+       if (lstat(path, &psb) == -1)
+               return -1;
+       if (S_ISLNK(psb.st_mode)) {
+               errno = EINVAL;
+               return -1;
+       }
+       return (chmod(path, mode));
+}
+#endif
diff -r 8410cee5e5f3 -r 42bd50112b9d tools/compat/lchown.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/compat/lchown.c     Tue Oct 08 00:28:36 2002 +0000
@@ -0,0 +1,62 @@
+/*     $NetBSD: lchown.c,v 1.1 2002/10/08 00:28:36 lukem Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Emulate lchown(2), checking path with lstat(2) first to ensure that
+ * it's not a symlink, and then call chown(2) */
+
+#include "config.h"
+
+#if !HAVE_LCHOWN
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
+
+int
+lchown(const char *path, uid_t owner, gid_t group)
+{
+       struct stat psb;
+
+       if (lstat(path, &psb) == -1)
+               return -1;
+       if (S_ISLNK(psb.st_mode)) {
+               errno = EINVAL;
+               return -1;
+       }
+       return (chown(path, owner, group));
+}
+#endif