r2266 - in glibc-package/branches/glibc-2.6/debian: . patches patches/any
Author: aurel32
Date: 2007-05-20 20:59:52 +0000 (Sun, 20 May 2007)
New Revision: 2266
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strfry.diff
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
- Update any/submitted-strfry.diff.
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 15:54:37 UTC (rev 2265)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 20:59:52 UTC (rev 2266)
@@ -34,7 +34,7 @@
- Update any/local-ldso-disable-hwcap.diff.
- Remove any/submitted-gethostbyname_r.diff (obsolete).
- Remove any/submitted-iconv-colon.diff (merged upstream).
- - Disable any/submitted-strfry.diff (broken).
+ - Update any/submitted-strfry.diff.
- Remove any/submitted-unistd_XOPEN_VERSION.diff (obsolete).
- Remove any/cvs-glob-c.diff (obsolete).
- Remove any/cvs-scanf_hexfloat.diff (obsolete).
Modified: glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strfry.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strfry.diff 2007-05-20 15:54:37 UTC (rev 2265)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strfry.diff 2007-05-20 20:59:52 UTC (rev 2266)
@@ -5,21 +5,21 @@
--- string/strfry.c 2007-04-21 23:12:47.000000000 +0200
+++ string/strfry.c 2007-04-21 23:22:46.000000000 +0200
-@@ -38,17 +38,17 @@
+@@ -37,16 +37,16 @@
+ init = 1;
}
- len = strlen (string);
+- len = strlen (string) - 1;
- for (i = 0; i < len; ++i)
++ len = strlen (string);
+ for (i = 0; i < len - 1; ++i)
{
int32_t j;
- char c;
-
__random_r (&rdata, &j);
-- j %= len;
+- j = j % len + 1;
+ j %= (len - i);
- c = string[i];
+ char c = string[i];
- string[i] = string[j];
- string[j] = c;
+ string[i] = string[j + i];
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 15:54:37 UTC (rev 2265)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 20:59:52 UTC (rev 2266)
@@ -122,5 +122,5 @@
any/submitted-getcwd-sys_param_h.diff -p0
any/submitted-clock-settime.diff -p0
any/submitted-date-and-unknown-tz.diff -p0
-# any/submitted-strfry.diff -p0
+any/submitted-strfry.diff -p0
any/local-disable-nscd-host-caching.diff
Reply to: