nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ls realloc loop.

This commit is contained in:
Jonas 'Sortie' Termansen 2016-01-08 00:47:14 +01:00
parent 8b52c0d818
commit f3e3c98084
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/ls.cpp
View File

@ -403,8 +403,8 @@ int ls(const char* path)
{ {
size_t newentrieslen = entrieslen * 2UL; size_t newentrieslen = entrieslen * 2UL;
struct dirent** newentries; struct dirent** newentries;
size_t newentriessize = sizeof(struct dirent*) * newentrieslen; entriessize = sizeof(struct dirent*) * newentrieslen;
newentries = (struct dirent**) realloc(entries, newentriessize); newentries = (struct dirent**) realloc(entries, entriessize);
if ( !newentries ) if ( !newentries )
{ {
ls_error(0, errno, "realloc"); ls_error(0, errno, "realloc");
@ -412,7 +412,6 @@ int ls(const char* path)
} }
entries = newentries; entries = newentries;
entrieslen = newentrieslen; entrieslen = newentrieslen;
entriessize = newentriessize;
} }
struct dirent* copy = dirent_dup(entry); struct dirent* copy = dirent_dup(entry);
if ( !copy ) if ( !copy )
@ -423,7 +422,7 @@ int ls(const char* path)
entries[entriesused++] = copy; entries[entriesused++] = copy;
} }
#if defined(sortix) #if defined(__sortix__)
if ( derror(dir) ) if ( derror(dir) )
{ {
ls_error(0, errno, path); ls_error(0, errno, path);