projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkfifoat: use new modules for Solaris and BSD bugs
[gnulib.git]
/
lib
/
lchown.c
diff --git
a/lib/lchown.c
b/lib/lchown.c
index
fa0826e
..
8cf10dd
100644
(file)
--- a/
lib/lchown.c
+++ b/
lib/lchown.c
@@
-1,12
+1,12
@@
/* Provide a stub lchown function for systems that lack it.
/* Provide a stub lchown function for systems that lack it.
- Copyright (C) 1998, 1999, 2002, 2004, 2006
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2004, 2006
, 2007, 2009 Fre
e
+
Software
Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,15
+14,20
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* written by Jim Meyering */
#include <config.h>
/* written by Jim Meyering */
#include <config.h>
-#include "lchown.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>
#include <sys/stat.h>
/* Work just like chown, except when FILE is a symbolic link.
#include <sys/stat.h>
/* Work just like chown, except when FILE is a symbolic link.
@@
-33,7
+38,8
@@
int
lchown (const char *file, uid_t uid, gid_t gid)
{
int
lchown (const char *file, uid_t uid, gid_t gid)
{
-#if ! CHOWN_MODIFIES_SYMLINK
+#if HAVE_CHOWN
+# if ! CHOWN_MODIFIES_SYMLINK
struct stat stats;
if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
struct stat stats;
if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode))
@@
-41,7
+47,12
@@
lchown (const char *file, uid_t uid, gid_t gid)
errno = EOPNOTSUPP;
return -1;
}
errno = EOPNOTSUPP;
return -1;
}
-#endif
+#
endif
return chown (file, uid, gid);
return chown (file, uid, gid);
+
+#else /* !HAVE_CHOWN */
+ errno = ENOSYS;
+ return -1;
+#endif
}
}