Author: aurel32
Date: 2006-04-02 21:56:25 +0000 (Sun, 02 Apr 2006)
New Revision: 1312
Added:
glibc-package/trunk/debian/patches/getcwd_c.diff
Removed:
glibc-package/trunk/debian/patches/getcwd_ia64.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace getcwd_ia64.diff by getcwd_c.diff (fix getcwd on platforms where
PAGE_SIZE >> PATH_MAX), backported from upstream. (Closes: #355109)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-02 11:36:02 UTC (rev
1311)
+++ glibc-package/trunk/debian/changelog 2006-04-02 21:56:25 UTC (rev
1312)
@@ -14,6 +14,8 @@
(Closes: #360126)
* Add siginfo_h.diff (fixes a typo in ILL_ILLOPN definition), backported
from upstream. (Closes: #358041)
+ * Replace getcwd_ia64.diff by getcwd_c.diff (fix getcwd on platforms where
+ PAGE_SIZE >> PATH_MAX), backported from upstream. (Closes: #355109)
-- Denis Barbier <[EMAIL PROTECTED]> Mon, 20 Mar 2006 21:36:11 +0100
Added: glibc-package/trunk/debian/patches/getcwd_c.diff
===================================================================
--- glibc-package/trunk/debian/patches/getcwd_c.diff 2006-04-02 11:36:02 UTC
(rev 1311)
+++ glibc-package/trunk/debian/patches/getcwd_c.diff 2006-04-02 21:56:25 UTC
(rev 1312)
@@ -0,0 +1,18 @@
+Use larger of PATH_MAX and page size when allocating buffer.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/getcwd.c,v
+retrieving revision 1.23
+retrieving revision 1.24
+diff -u -r1.23 -r1.24
+--- libc/sysdeps/unix/sysv/linux/getcwd.c 2006/01/08 08:21:15 1.23
++++ libc/sysdeps/unix/sysv/linux/getcwd.c 2006/04/02 17:58:28 1.24
+@@ -87,7 +87,7 @@
+ return NULL;
+ }
+
+- alloc_size = PATH_MAX;
++ alloc_size = MAX (PATH_MAX, __getpagesize ());
+ }
+
+ if (buf == NULL)
Deleted: glibc-package/trunk/debian/patches/getcwd_ia64.diff
===================================================================
--- glibc-package/trunk/debian/patches/getcwd_ia64.diff 2006-04-02 11:36:02 UTC
(rev 1311)
+++ glibc-package/trunk/debian/patches/getcwd_ia64.diff 2006-04-02 21:56:25 UTC
(rev 1312)
@@ -1,11 +0,0 @@
---- libc/sysdeps/unix/sysv/linux/getcwd.c.orig 2006-03-10 17:42:19.000000000
+0100
-+++ libc/sysdeps/unix/sysv/linux/getcwd.c 2006-03-10 17:45:39.000000000
+0100
-@@ -127,7 +127,7 @@
- /* It should never happen that the `getcwd' syscall failed because
- the buffer is too small if we allocated the buffer ourselves
- large enough. */
-- assert (errno != ERANGE || buf != NULL || size != 0);
-+/* assert (errno != ERANGE || buf != NULL || size != 0); */
-
- # ifndef NO_ALLOCATION
- if (buf == NULL)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-02 11:36:02 UTC (rev
1311)
+++ glibc-package/trunk/debian/patches/series 2006-04-02 21:56:25 UTC (rev
1312)
@@ -138,5 +138,5 @@
tst-setcontext_c.diff -p1
strfmon.diff
argp_h.diff -p1
-getcwd_ia64.diff -p1
+getcwd_c.diff -p1
siginfo_h.diff -p1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
