[uClibc-cvs] uClibc/libc/misc/dirent dirstream.h,1.5,1.6 readdir.c,1.7,1.8 readdir64.c,1.8,1.9 readdir64_r.c,1.2,1.3 readdir_r.c,1.2,1.3 scandir64.c,1.6,1.7

[Erik Andersen]

Update of /var/cvs/uClibc/libc/misc/dirent
In directory winder:/tmp/cvs-serv17535/libc/misc/dirent

Modified Files:
	dirstream.h readdir.c readdir64.c readdir64_r.c readdir_r.c 
	scandir64.c 
Log Message:
Fix scandir64 to not free the wrong pieces of memory (which could
and did cause segfaults) by adjusting the working scandir.c to
the the 64 thing.  Fix up potential for mismatches between the
libc and kernel dirent structures, which could also cause ugly
problems.
 -Erik


Index: dirstream.h
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/dirstream.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dirstream.h	30 May 2002 13:17:44 -0000	1.5
+++ dirstream.h	28 Jan 2003 11:06:03 -0000	1.6
@@ -70,4 +70,8 @@
 #endif
 };				/* stream data from opendir() */
 
+
+extern int __getdents(unsigned int fd, struct dirent *dirp, unsigned int count);
+extern int __getdents64 (unsigned int fd, struct dirent64 *dirp, unsigned int count);
+
 #endif /* dirent.h  */

Index: readdir.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- readdir.c	30 May 2002 13:17:44 -0000	1.7
+++ readdir.c	28 Jan 2003 11:06:03 -0000	1.8
@@ -5,8 +5,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-extern int getdents __P ((unsigned int fd, struct dirent *dirp, unsigned int count));
-
 
 struct dirent *readdir(DIR * dir)
 {
@@ -25,7 +23,7 @@
 	do {
 	    if (dir->dd_size <= dir->dd_nextloc) {
 		/* read dir->dd_max bytes of directory entries. */
-		bytes = getdents(dir->dd_fd, dir->dd_buf, dir->dd_max);
+		bytes = __getdents(dir->dd_fd, dir->dd_buf, dir->dd_max);
 		if (bytes <= 0) {
 		    de = NULL;
 		    goto all_done;

Index: readdir64.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir64.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- readdir64.c	31 Oct 2002 18:19:30 -0000	1.8
+++ readdir64.c	28 Jan 2003 11:06:03 -0000	1.9
@@ -20,8 +20,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-extern int getdents64 __P ((unsigned int fd, struct dirent64 *dirp, unsigned int count));
-
 
 struct dirent64 *readdir64(DIR * dir)
 {
@@ -40,7 +38,7 @@
 	do {
 	    if (dir->dd_size <= dir->dd_nextloc) {
 		/* read dir->dd_max bytes of directory entries. */
-		bytes = getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
+		bytes = __getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
 		if (bytes <= 0) {
 		    de = NULL;
 		    goto all_done;

Index: readdir64_r.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir64_r.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- readdir64_r.c	31 Oct 2002 18:19:30 -0000	1.2
+++ readdir64_r.c	28 Jan 2003 11:06:03 -0000	1.3
@@ -19,8 +19,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-extern int getdents64 __P ((unsigned int fd, struct dirent64 *dirp, unsigned int count));
-
 
 int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
 {
@@ -41,7 +39,7 @@
 	do {
 	    if (dir->dd_size <= dir->dd_nextloc) {
 		/* read dir->dd_max bytes of directory entries. */
-		bytes = getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
+		bytes = __getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
 		if (bytes <= 0) {
 		    *result = NULL;
 		    ret = errno;

Index: readdir_r.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/readdir_r.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- readdir_r.c	30 May 2002 13:17:44 -0000	1.2
+++ readdir_r.c	28 Jan 2003 11:06:03 -0000	1.3
@@ -5,8 +5,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-extern int getdents __P ((unsigned int fd, struct dirent *dirp, unsigned int count));
-
 
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 {
@@ -27,7 +25,7 @@
 	do {
 	    if (dir->dd_size <= dir->dd_nextloc) {
 		/* read dir->dd_max bytes of directory entries. */
-		bytes = getdents(dir->dd_fd, dir->dd_buf, dir->dd_max);
+		bytes = __getdents(dir->dd_fd, dir->dd_buf, dir->dd_max);
 		if (bytes <= 0) {
 		    *result = NULL;
 		    ret = errno;

Index: scandir64.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/dirent/scandir64.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scandir64.c	31 Oct 2002 18:19:30 -0000	1.6
+++ scandir64.c	28 Jan 2003 11:06:03 -0000	1.7
@@ -1,27 +1,24 @@
-/* -*- Mode: C; c-file-style: "gnu" -*- */
-/*
-   Copyright (c) 2000 Petter Reinholdtsen
+/* Copyright (C) 1992-1998, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  
+   */
+
+/* Modified for uClibc by Erik Andersen
+   */
 
 #include <features.h>
 #ifdef __UCLIBC_HAS_LFS__
@@ -37,66 +34,80 @@
 #ifdef __USE_FILE_OFFSET64
 # undef __USE_FILE_OFFSET64
 #endif
+
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <sys/types.h>
 #include "dirstream.h"
 
-
-int scandir64(const char *dir, struct dirent64 ***namelist,
-			 int (*selector) (const struct dirent64 *),
-			 int (*compar) (const __ptr_t, const __ptr_t))
+int scandir64(const char *dir, struct dirent64 ***namelist, 
+	int (*selector) (const struct dirent64 *),
+	int (*compar) (const void *, const void *))
 {
-    DIR *d = opendir(dir);
+    DIR *dp = opendir (dir);
     struct dirent64 *current;
-    struct dirent64 **names;
-    int count = 0;
-    int pos = 0;
-    int result = -1;
-
-    if (NULL == d)
-        return -1;
-
-    while (NULL != readdir64(d))
-        count++;
+    struct dirent64 **names = NULL;
+    size_t names_size = 0, pos;
+    int save;
 
-    if (!(names = malloc(sizeof (struct dirent64 *) * count))) {
-	closedir(d);
+    if (dp == NULL)
 	return -1;
-    }
 
-    rewinddir(d);
+    save = errno;
+    __set_errno (0);
 
-    while (NULL != (current = readdir64(d))) {
-        if (NULL == selector || selector(current)) {
-            struct dirent64 *copyentry = malloc(current->d_reclen);
+    pos = 0;
+    while ((current = readdir64 (dp)) != NULL)
+	if (selector == NULL || (*selector) (current))
+	{
+	    struct dirent64 *vnew;
+	    size_t dsize;
 
-            memcpy(copyentry, current, current->d_reclen);
+	    /* Ignore errors from selector or readdir64 */
+	    __set_errno (0);
 
-            names[pos] = copyentry;
-            pos++;
-        }
-    }
-    result = closedir(d);
+	    if (unlikely(pos == names_size))
+	    {
+		struct dirent64 **new;
+		if (names_size == 0)
+		    names_size = 10;
+		else
+		    names_size *= 2;
+		new = (struct dirent64 **) realloc (names, names_size * sizeof (struct dirent64 *));
+		if (new == NULL)
+		    break;
+		names = new;
+	    }
 
-    if (pos != count) {
-	struct dirent64 **tmp;
-	if (!(tmp = realloc(names, sizeof (struct dirent64 *) * pos))) {
-	    free(names);
-	    return -1;
-	}
-	names = tmp;
-    }
+	    dsize = &current->d_name[_D_ALLOC_NAMLEN (current)] - (char *) current;
+	    vnew = (struct dirent64 *) malloc (dsize);
+	    if (vnew == NULL)
+		break;
 
+	    names[pos++] = (struct dirent64 *) memcpy (vnew, current, dsize);
+	}
 
-    if (compar != NULL) {
-	qsort(names, pos, sizeof (struct dirent64 *), compar);
+    if (unlikely(errno != 0))
+    {
+	save = errno;
+	closedir (dp);
+	while (pos > 0)
+	    free (names[--pos]);
+	free (names);
+	__set_errno (save);
+	return -1;
     }
 
-    *namelist = names;
+    closedir (dp);
+    __set_errno (save);
 
+    /* Sort the list if we have a comparison function to sort with.  */
+    if (compar != NULL)
+	qsort (names, pos, sizeof (struct dirent64 *), compar);
+    *namelist = names;
     return pos;
 }
 #endif /* __UCLIBC_HAS_LFS__ */