summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2006-07-20 19:31:07 +0000
committerMike Frysinger2006-07-20 19:31:07 +0000
commit8840759c6147277a1e8b1c2a315e42daf4e0b794 (patch)
tree7327a27989e75b2ec938bde8d64e6043f613bb64
parenteea561871b45a2335ab6a09f14dad627ffcdc1cd (diff)
downloadbusybox-8840759c6147277a1e8b1c2a315e42daf4e0b794.zip
busybox-8840759c6147277a1e8b1c2a315e42daf4e0b794.tar.gz
move lchown/chown define out of specific files and into platform.h where it belongs
-rw-r--r--coreutils/chgrp.c5
-rw-r--r--include/platform.h8
2 files changed, 7 insertions, 6 deletions
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 46db408..5064f2d 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -16,11 +16,6 @@
#include <unistd.h>
#include "busybox.h"
-/* Don't use lchown glibc older then 2.1.x */
-#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
-#define lchown chown
-#endif
-
static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
{
if (lchown(fileName, statbuf->st_uid, *((long *) junk)) == 0) {
diff --git a/include/platform.h b/include/platform.h
index 7157f8a..8890d4f 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -171,7 +171,7 @@ typedef unsigned long long int uintmax_t;
#endif
#endif
-/* uclibc does not implement daemon for no-mmu systems.
+/* uclibc does not implement daemon() for no-mmu systems.
* For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably.
* For earlier versions there is no reliable way to check if we are building
* for a mmu-less system; the user should pass EXTRA_CFLAGS="-DBB_NOMMU"
@@ -187,6 +187,12 @@ typedef unsigned long long int uintmax_t;
* out of the tree, so stop saying it should be. */
#define fdprintf dprintf
+/* Don't use lchown with glibc older then 2.1.x ... uC-libc lacks it */
+#if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \
+ defined __UC_LIBC__
+# define lchown chown
+#endif
+
/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */
/* FIXME: fix tar.c! */
#ifndef FNM_LEADING_DIR