libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / libbb / xreadlink.c

diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index faa0e1646cfe4592b6833b5b5bf5078ff62e3098..bb63da08c86c1c2dad6d90d8da6e974db8fde663 100644 (file)
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -3,11 +3,17 @@
  * xreadlink.c - safe implementation of readlink.
  * Returns a NULL on failure...
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
+/* some systems (eg Hurd) does not have MAXSYMLINKS definition,
+ * set it to some reasonable value if it isn't defined */
+#ifndef MAXSYMLINKS
+# define MAXSYMLINKS 20
+#endif
+
 /*
  * NOTE: This function returns a malloced char* that you will have to free
  * yourself.
@@ -102,7 +108,8 @@ char* FAST_FUNC xmalloc_readlink_or_warn(const char *path)
 
 char* FAST_FUNC xmalloc_realpath(const char *path)
 {
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
+#if defined(__GLIBC__) || \
+    (defined(__UCLIBC__) && UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 31))
        /* glibc provides a non-standard extension */
        /* new: POSIX.1-2008 specifies this behavior as well */
        return realpath(path, NULL);