Per some comments from Lars Kellogg-Stedman <lars@larsshack.org>,

make xreadlink() return NULL on failure, and make sure everyone
uses the interface correctly.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@2551 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 6 insertions, 3 deletions

diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 66f63b883..932e487a5 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -1,5 +1,6 @@
 /*
- *  xreadlink.c - safe implementation of readlink
+ *  xreadlink.c - safe implementation of readlink.
+ *  Returns a NULL on failure...
  */
 
 #include <stdio.h>
@@ -22,8 +23,10 @@ extern char *xreadlink(const char *path)
         do {
                 buf = xrealloc(buf, bufsize += GROWBY);
                 readsize = readlink(path, buf, bufsize); /* 1st try */
-                if (readsize == -1)
-                        perror_msg("%s:%s", applet_name, path);
+                if (readsize == -1) {
+                    perror_msg("%s:%s", applet_name, path);
+                    return NULL;
+                }
         }           
         while (bufsize < readsize + 1);