[uClibc-cvs] uClibc/libc/misc/ftw ftw.c,1.4,1.5

[Erik Andersen]

Update of /var/cvs/uClibc/libc/misc/ftw
In directory winder:/tmp/cvs-serv5912/libc/misc/ftw

Modified Files:
	ftw.c 
Log Message:
Fix up several errors related to filename length and errno that 
showed up while running the latest LTP testsuite.
 -Erik


Index: ftw.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/ftw/ftw.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ftw.c	6 Sep 2003 02:58:32 -0000	1.4
+++ ftw.c	8 Nov 2003 06:33:35 -0000	1.5
@@ -492,11 +492,14 @@
     char *cp;
 
     /* First make sure the parameters are reasonable.  */
-    if (dir[0] == '\0')
-    {
+    if (unlikely(dir==NULL || *dir=='\0')) {
 	__set_errno (ENOENT);
 	return -1;
     }
+    if ((strlen(dir)+1) > NAME_MAX) {
+	__set_errno(ENAMETOOLONG);
+	return -1;
+    }
 
     data.maxdir = descriptors < 1 ? 1 : descriptors;
     data.actdir = 0;