r2006 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2007-02-21 12:01:41 +0100 (Wed, 21 Feb 2007)
New Revision: 2006
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-ftw-c.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* any/cvs-ftw-c.diff: new patch (fix nftw() with FTW_CHDIR in /) from CVS.
Closes: #367522.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-21 10:11:44 UTC (rev 2005)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-21 11:01:41 UTC (rev 2006)
@@ -129,6 +129,8 @@
versioned conflict. Closes: #407540.
* any/local-mktemp.diff: new patch (also propose mkdtemp as an alternative
to mktemp). Closes: #377310.
+ * any/cvs-ftw-c.diff: new patch (fix nftw() with FTW_CHDIR in /) from CVS.
+ Closes: #367522.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Added: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-ftw-c.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-ftw-c.diff 2007-02-21 10:11:44 UTC (rev 2005)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-ftw-c.diff 2007-02-21 11:01:41 UTC (rev 2006)
@@ -0,0 +1,53 @@
+2007-02-21 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #4076]
+ * io/ftw.c (ftw_startup): Handle special case of FTW_CHDIR in /.
+ (open_dir_stream): Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/libc/io/ftw.c,v
+retrieving revision 1.54
+retrieving revision 1.55
+diff -u -r1.54 -r1.55
+--- libc/io/ftw.c 2006/05/10 06:35:59 1.54
++++ libc/io/ftw.c 2007/02/21 09:36:15 1.55
+@@ -348,8 +348,17 @@
+ }
+ else
+ {
+- const char *name = ((data->flags & FTW_CHDIR)
+- ? data->dirbuf + data->ftw.base: data->dirbuf);
++ const char *name;
++
++ if (data->flags & FTW_CHDIR)
++ {
++ name = data->dirbuf + data->ftw.base;
++ if (name[0] == '\0')
++ name = ".";
++ }
++ else
++ name = data->dirbuf;
++
+ dirp->stream = __opendir (name);
+ }
+
+@@ -721,9 +730,16 @@
+ /* Get stat info for start directory. */
+ if (result == 0)
+ {
+- const char *name = ((data.flags & FTW_CHDIR)
+- ? data.dirbuf + data.ftw.base
+- : data.dirbuf);
++ const char *name;
++
++ if (data.flags & FTW_CHDIR)
++ {
++ name = data.dirbuf + data.ftw.base;
++ if (name[0] == '\0')
++ name = ".";
++ }
++ else
++ name = data.dirbuf;
+
+ if (((flags & FTW_PHYS)
+ ? LXSTAT (_STAT_VER, name, &st)
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-21 10:11:44 UTC (rev 2005)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-21 11:01:41 UTC (rev 2006)
@@ -95,6 +95,7 @@
all/submitted-new-brf-encoding.diff -p0
any/cvs-2.5-branch-update.diff -p1
+any/cvs-ftw-c.diff -p0
any/cvs-itoa-c.diff -p1
any/cvs-lt-update.diff -p0
any/cvs-zdump-64-bit.diff -p1
Reply to: