Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/xreadlink.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/xreadlink.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/libbb/xreadlink.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  *  xreadlink.c - safe implementation of readlink.
@@ -4 +5 @@
  */
 
-#include <stdio.h>
+#include "libbb.h"
 
 /*
@@ -10 +11 @@
  * yourself. You have been warned.
  */
-
-#include <unistd.h>
-#include "libbb.h"
-
-char *xreadlink(const char *path)
+char *xmalloc_readlink(const char *path)
 {
     enum { GROWBY = 80 }; /* how large we will grow strings by */
@@ -23 +20 @@
     do {
         buf = xrealloc(buf, bufsize += GROWBY);
-        readsize = readlink(path, buf, bufsize); /* 1st try */
+        readsize = readlink(path, buf, bufsize);
         if (readsize == -1) {
-            bb_perror_msg("%s", path);
             free(buf);
             return NULL;
         }
-    }
-    while (bufsize < readsize + 1);
+    } while (bufsize < readsize + 1);
 
     buf[readsize] = '\0';
@@ -36 +31 @@
     return buf;
 }
+
+char *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);
+    }
+    return buf;
+}
+
+/* UNUSED */
+#if 0
+char *xmalloc_realpath(const char *path)
+{
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
+    /* glibc provides a non-standard extension */
+    return realpath(path, NULL);
+#else
+    char buf[PATH_MAX+1];
+
+    /* on error returns NULL (xstrdup(NULL) ==NULL) */
+    return xstrdup(realpath(path, buf));
+#endif
+}
+#endif