From f3e3c98084f92e0e3f71282775b18282d43c3276 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Fri, 8 Jan 2016 00:47:14 +0100 Subject: [PATCH] Fix ls realloc loop. --- utils/ls.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/ls.cpp b/utils/ls.cpp index 77c2b3ee..92d8bcc5 100644 --- a/utils/ls.cpp +++ b/utils/ls.cpp @@ -403,8 +403,8 @@ int ls(const char* path) { size_t newentrieslen = entrieslen * 2UL; struct dirent** newentries; - size_t newentriessize = sizeof(struct dirent*) * newentrieslen; - newentries = (struct dirent**) realloc(entries, newentriessize); + entriessize = sizeof(struct dirent*) * newentrieslen; + newentries = (struct dirent**) realloc(entries, entriessize); if ( !newentries ) { ls_error(0, errno, "realloc"); @@ -412,7 +412,6 @@ int ls(const char* path) } entries = newentries; entrieslen = newentrieslen; - entriessize = newentriessize; } struct dirent* copy = dirent_dup(entry); if ( !copy ) @@ -423,7 +422,7 @@ int ls(const char* path) entries[entriesused++] = copy; } -#if defined(sortix) +#if defined(__sortix__) if ( derror(dir) ) { ls_error(0, errno, path);