Revamp lchown so that it lives in unistd.h where it belongs.

[pspp] / lib / lchown.c

diff --git a/lib/lchown.c b/lib/lchown.c
index f1e21e7e6657d6149804a2bced43ee547fe3daa5..4ed47421162c708cbd35078e07c170f69af403be 100644 (file)
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -1,5 +1,7 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2002, 2004, 2006, 2007 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
@@ -13,33 +15,49 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
+/* If the system chown does not follow symlinks, we don't want it
+   replaced by gnulib's chown, which does follow symlinks.  */
+#if CHOWN_MODIFIES_SYMLINK
+# define REPLACE_CHOWN 0
+#endif
+#include <unistd.h>
+
 #include <errno.h>
-#ifndef errno
-extern int errno;
+#include <sys/stat.h>
+
+/* Some systems don't have EOPNOTSUPP.  */
+#ifndef EOPNOTSUPP
+# ifdef ENOTSUP
+#  define EOPNOTSUPP ENOTSUP
+# else
+/* Some systems don't have ENOTSUP either.  */
+#  define EOPNOTSUPP EINVAL
+# endif
 #endif
-#include "lchown.h"
 
 /* Work just like chown, except when FILE is a symbolic link.
-   In that case, set errno to ENOSYS and return -1.  */
+   In that case, set errno to EOPNOTSUPP and return -1.
+   But if autoconf tests determined that chown modifies
+   symlinks, then just call chown.  */
 
 int
 lchown (const char *file, uid_t uid, gid_t gid)
 {
+#if ! CHOWN_MODIFIES_SYMLINK
   struct stat stats;
 
   if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
     {
-      errno = ENOSYS;
+      errno = EOPNOTSUPP;
       return -1;
     }
+#endif
 
   return chown (file, uid, gid);
 }