[Glibc-bsd-commits] r1619 - trunk/glibc-2.3-head

[Petr Salinger]

Author: ps-guest
Date: 2006-06-26 16:21:52 +0000 (Mon, 26 Jun 2006)
New Revision: 1619

Added:
   trunk/glibc-2.3-head/glibc24-ftw.diff
Modified:
   trunk/glibc-2.3-head/NOTES-2.4
Log:
* [glibc 2.4] fix ftw failures 



Modified: trunk/glibc-2.3-head/NOTES-2.4
===================================================================
--- trunk/glibc-2.3-head/NOTES-2.4	2006-06-26 16:17:21 UTC (rev 1618)
+++ trunk/glibc-2.3-head/NOTES-2.4	2006-06-26 16:21:52 UTC (rev 1619)
@@ -17,6 +17,7 @@
 	glibc24-cfi-sysdeps.diff
 	glibc24-extra-sysdeps.diff
 	glibc24-memusage_no_mremap.diff
+	glibc24-ftw.diff
 	glibc25-queue.h
 
 
@@ -48,6 +49,9 @@
 	it is used unconditionally also in testsuite :-((
 	(workaround currently in glibc24-extra-sysdeps.diff)
 
+* io/ftw.c uses unconditionally (unimplemented) *at functions
+	revert to previous behaviour - by glibc24-ftw.diff
+	
 * enable mandatory cfi marking - by glibc24-cfi-sysdeps.diff 
 
 * update sysdeps - by glibc24-extra-sysdeps.diff
@@ -83,8 +87,6 @@
 make[2]: *** [/build/g24/build/dirent/tst-fdopendir.o] Error 1
 make[2]: *** [/build/g24/build/posix/tst-waitid.out] Error 1
 
-make[2]: *** [/build/g24/build/io/bug-ftw2.out] Error 1
-make[2]: *** [/build/g24/build/io/bug-ftw4.out] Error 1
 make[2]: *** [/build/g24/build/io/tst-readlinkat.out] Error 1
 make[2]: *** [/build/g24/build/misc/tst-pselect.out] Error 1
 

Added: trunk/glibc-2.3-head/glibc24-ftw.diff
===================================================================
--- trunk/glibc-2.3-head/glibc24-ftw.diff	2006-06-26 16:17:21 UTC (rev 1618)
+++ trunk/glibc-2.3-head/glibc24-ftw.diff	2006-06-26 16:21:52 UTC (rev 1619)
@@ -0,0 +1,48 @@
+
+disable unimplemented *at function
+
+
+--- io/ftw.c~	2006-06-26 19:35:23.000000000 +0200
++++ io/ftw.c	2006-06-26 19:35:23.000000000 +0200
+@@ -338,6 +338,7 @@
+     {
+       assert (data->dirstreams[data->actdir] == NULL);
+ 
++#if 0
+       if (dfdp != NULL && *dfdp != -1)
+ 	{
+ 	  int fd = openat64_not_cancel_3 (*dfdp, data->dirbuf + data->ftw.base,
+@@ -347,6 +348,7 @@
+ 	    close_not_cancel_no_status (fd);
+ 	}
+       else
++#endif      
+ 	{
+ 	  const char *name = ((data->flags & FTW_CHDIR)
+ 			      ? data->dirbuf + data->ftw.base: data->dirbuf);
+@@ -401,10 +403,12 @@
+   *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0';
+ 
+   int statres;
++#if 0  
+   if (dir->streamfd != -1)
+     statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
+ 			(data->flags & FTW_PHYS) ? AT_SYMLINK_NOFOLLOW : 0);
+   else
++#endif  
+     {
+       if ((data->flags & FTW_CHDIR) == 0)
+ 	name = data->dirbuf;
+@@ -424,10 +428,12 @@
+ 	flag = FTW_SLN;
+       else
+ 	{
++#if 0	
+ 	  if (dir->streamfd != -1)
+ 	    statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
+ 				AT_SYMLINK_NOFOLLOW);
+ 	  else
++#endif	  
+ 	    statres = LXSTAT (_STAT_VER, name, &st);
+ 	  if (statres == 0 && S_ISLNK (st.st_mode))
+ 	    flag = FTW_SLN;