r1317 - glibc-package/trunk/debian/patches
Author: barbier
Date: 2006-04-03 22:52:01 +0000 (Mon, 03 Apr 2006)
New Revision: 1317
Modified:
glibc-package/trunk/debian/patches/getcwd_c.diff
Log:
Fix broken CVS, MAX is undefined.
Modified: glibc-package/trunk/debian/patches/getcwd_c.diff
===================================================================
--- glibc-package/trunk/debian/patches/getcwd_c.diff 2006-04-03 21:50:36 UTC (rev 1316)
+++ glibc-package/trunk/debian/patches/getcwd_c.diff 2006-04-03 22:52:01 UTC (rev 1317)
@@ -1,18 +1,19 @@
Use larger of PATH_MAX and page size when allocating buffer.
+See BZ2418
+Note: CVS 1.24 does not build, MAX macro is undefined
+Index: glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
===================================================================
-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;
- }
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/getcwd.c
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
+@@ -86,7 +86,9 @@
+ return NULL;
+ }
- alloc_size = PATH_MAX;
-+ alloc_size = MAX (PATH_MAX, __getpagesize ());
++ alloc_size = __getpagesize ();
++ if (alloc_size < PATH_MAX)
++ alloc_size = PATH_MAX;
}
if (buf == NULL)
Reply to: