X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flchown.c;h=fa0826edb95c18c3b8a488bba01f2694a140df6f;hb=39bc7a80b6719b1c7d0f8fb1b01380649cb8e358;hp=391f5ca984ad24fe431cb5d0e91dcf56b704c24e;hpb=33d5b81171419e47393f7d520f9dd5911f1cd973;p=gnulib.git

diff --git a/lib/lchown.c b/lib/lchown.c
index 391f5ca98..fa0826edb 100644
--- 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, 1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2002, 2004, 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
@@ -13,45 +15,33 @@
 
    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>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 #include "lchown.h"
 
-#ifdef STAT_MACROS_BROKEN
-# undef S_ISLNK
-#endif
-#if !defined(S_ISLNK) && defined(S_IFLNK)
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-
-
-/* Declare chown to avoid a warning.  Don't include unistd.h,
-   because it may have a conflicting prototype for lchown.  */
-int chown ();
+#include <sys/stat.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);
 }