X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flchown.c;h=073e00419aaebee488c0a4d10c5ecf49b39a60fc;hb=f80143b5b5eecb2600d1d680fca3c2ecc90cbcbe;hp=3e2b6c9f25a3f0eb77df6164af3a7900fbb16b80;hpb=5e3f50237a1c33968f4adf865211b65e1100785a;p=gnulib.git

diff --git a/lib/lchown.c b/lib/lchown.c
index 3e2b6c9f2..073e00419 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 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
@@ -25,6 +25,23 @@
 #ifndef errno
 extern int errno;
 #endif
+#include "lchown.h"
+
+#ifdef STAT_MACROS_BROKEN
+# undef S_ISLNK
+#endif
+
+#ifndef S_ISLNK
+# ifdef S_IFLNK
+#  define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# else
+#  define S_ISLNK(m) 0
+# endif
+#endif
+
+/* 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.  */
@@ -34,7 +51,7 @@ lchown (const char *file, uid_t uid, gid_t gid)
 {
   struct stat stats;
 
-  if (lstat (file, &stats) && S_ISLNK (stats.st_mode))
+  if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
     {
       errno = ENOSYS;
       return -1;