X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flchown.c;h=b04fb36468bd5caa343b877e8b5708936a75f206;hb=fdbc2d4ba69ef24b623b87cb6fd2114215e7b52b;hp=b15233e246d9bf30c7eca6a89ec074469d3093ee;hpb=07d201fb10f5f9e48656740041eba128e0f9c467;p=gnulib.git

diff --git a/lib/lchown.c b/lib/lchown.c
index b15233e24..b04fb3646 100644
--- a/lib/lchown.c
+++ b/lib/lchown.c
@@ -1,5 +1,5 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 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
@@ -19,31 +19,34 @@
 
 #include <config.h>
 
-/* Disable the definition of lchown to rpl_lchown (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_lchown on
-   most systems.  */
-#undef lchown
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+
+#include "lchown.h"
+#include "stat-macros.h"
+
+/* Declare chown to avoid a warning.  Don't include unistd.h,
+   because it may have a conflicting prototype for lchown.  */
+int chown ();
 
 /* 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
-rpl_lchown (const chat *file, uid_t uid, gid_t gid)
+lchown (const char *file, uid_t uid, gid_t gid)
 {
+#if ! CHOWN_MODIFIES_SYMLINK
   struct stat stats;
 
-  if (lstat (file, &stats) && S_ISLNK (stats.st_mode))
+  if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
     {
-      errno = ENOSYS;
+      errno = EOPNOTSUPP;
       return -1;
     }
+#endif
 
   return chown (file, uid, gid);
 }