From 89a9e37b7a7a2134cedb6d27db265a8ab774f9d1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 20 Mar 1998 12:06:55 +0000 Subject: Update. 1998-03-20 11:58 Ulrich Drepper * dirent/Makefile (routines): Add scandir64, alphasort64, and versionsort64. * dirent/alphasort64.c: New file. * dirent/scandir64.c: New file. * dirent/versionsort64.c: New file. * dirent/dirent.h: Add LFS support for scandir, alphasort, and versionsort. * sysdeps/generic/readdir64.c: Rename to __readdir64 and make old name weak alias. * sysdeps/unix/sysv/linux/readdir64.c: Likewise. * dirent/alphasort.c: Use strcoll instead of strcmp. * dirent/scandir.c: Optimize a bit. * dirent/versionsort.c: Pretty print. 1998-03-20 Ulrich Drepper * string/string.h: Add prototype for __strtok_r. --- dirent/scandir.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'dirent/scandir.c') diff --git a/dirent/scandir.c b/dirent/scandir.c index ef7531fa95..cffc8a98cb 100644 --- a/dirent/scandir.c +++ b/dirent/scandir.c @@ -44,6 +44,7 @@ scandir (dir, namelist, select, cmp) while ((d = __readdir (dp)) != NULL) if (select == NULL || (*select) (d)) { + struct dirent *vnew; size_t dsize; /* Ignore errors from select or readdir */ @@ -58,20 +59,16 @@ scandir (dir, namelist, select, cmp) vsize *= 2; new = (struct dirent **) realloc (v, vsize * sizeof (*v)); if (new == NULL) - { - lose: - __set_errno (ENOMEM); - break; - } + break; v = new; } dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d; - v[i] = (struct dirent *) malloc (dsize); - if (v[i] == NULL) - goto lose; + vnew = (struct dirent *) malloc (dsize); + if (vnew == NULL) + break; - memcpy (v[i++], d, dsize); + v[i++] = (struct dirent *) memcpy (vnew, d, dsize); } if (errno != 0) -- cgit v1.2.3