Made new xreadlink function for libbb and changed applets to use it instead of

readlink(2).


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

1 files changed, 6 insertions, 6 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index d24ba9866..c13b225fa 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -577,7 +577,7 @@ static struct dnode **list_dir(char *path)
 /*----------------------------------------------------------------------*/
 static int list_single(struct dnode *dn)
 {
-        int i, len;
+        int i;
         char scratch[BUFSIZ + 1];
 #ifdef BB_FEATURE_LS_TIMESTAMPS
         char *filetime;
@@ -688,16 +688,16 @@ static int list_single(struct dnode *dn)
                                 break;
                         case LIST_SYMLINK:
                                 if (S_ISLNK(dn->dstat.st_mode)) {
-                                        len= readlink(dn->fullname, scratch, (sizeof scratch)-1);
-                                        if (len > 0) {
-                                                scratch[len]= '\0';
-                                                printf(" -> %s", scratch);
+                                        char *lpath = xreadlink(dn->fullname);
+                                        if (lpath) {
+                                                printf(" -> %s", lpath);
 #ifdef BB_FEATURE_LS_FILETYPES
                                                 if (!stat(dn->fullname, &info)) {
                                                         append = append_char(info.st_mode);
                                                 }
 #endif
-                                                column += len+4;
+                                                column += strlen(lpath) + 4;
+                                                free(lpath);
                                         }
                                 }
                                 break;