Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / xreadlink.c

diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 6bff4be..bb63da0 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.
@@ -91,23 +97,26 @@ char* FAST_FUNC xmalloc_readlink_or_warn(const char *path)
        char *buf = xmalloc_readlink(path);
        if (!buf) {
                /* EINVAL => "file: Invalid argument" => puzzled user */
-               bb_error_msg("%s: cannot read link (not a symlink?)", path);
+               const char *errmsg = "not a symlink";
+               int err = errno;
+               if (err != EINVAL)
+                       errmsg = strerror(err);
+               bb_error_msg("%s: cannot read link: %s", path, errmsg);
        }
        return buf;
 }
 
-/* UNUSED */
-#if 0
 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);
 #else
        char buf[PATH_MAX+1];
 
-       /* on error returns NULL (xstrdup(NULL) ==NULL) */
+       /* on error returns NULL (xstrdup(NULL) == NULL) */
        return xstrdup(realpath(path, buf));
 #endif
 }
-#endif