* getcwd.c (AT_FDCWD): Work around a bug in Solaris 9 and 10, where

AT_FDCWD exceeds INT_MAX.
* openat.h (AT_FDCWD): Likewise.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1a79df7ad505e50eb7591135b00f7eb0c1c2e9e3..11ff70906f63901a4a34eddf977b7d8cd29186c6 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * getcwd.c (AT_FDCWD): Work around a bug in Solaris 9 and 10, where
+       AT_FDCWD exceeds INT_MAX.
+       * openat.h (AT_FDCWD): Likewise.
+
 2006-02-14  Jim Meyering  <jim@meyering.net>
 
        Sync from coreutils.

diff --git a/lib/getcwd.c b/lib/getcwd.c
index ec1771b83d87ed90d6f0b23cf467f8d539f852ef..5bb9e4be14eb61de5be91734fb4cacd065624d56 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2004,2005 Free Software
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2004,2005,2006 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -74,6 +74,14 @@
 
 #include <limits.h>
 
+/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive.  Its
+   value exceeds INT_MAX, so its use as an int doesn't conform to the
+   C standard, and GCC and Sun C complain in some cases.  */
+#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
+# undef AT_FDCWD
+# define AT_FDCWD (-3041965)
+#endif
+
 #ifdef ENAMETOOLONG
 # define is_ENAMETOOLONG(x) ((x) == ENAMETOOLONG)
 #else

diff --git a/lib/openat.h b/lib/openat.h
index 15b1d9df8f2fbd698f88b40ebd293d2d0565f091..fd1bca5026f06ca2a81d5f1c4bf3ba173f5c8542 100644 (file)
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -1,5 +1,5 @@
 /* provide a replacement openat function
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,10 +35,24 @@
 # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
 #endif
 
+/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive.  Its
+   value exceeds INT_MAX, so its use as an int doesn't conform to the
+   C standard, and GCC and Sun C complain in some cases.  If the bug
+   is present, undef AT_FDCWD here, so it can be redefined below.  */
+#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
+# undef AT_FDCWD
+#endif
+
+/* Use the same bit pattern as Solaris 9, but with the proper
+   signedness.  The bit pattern is important, in case this actually is
+   Solaris with the above workaround.  */
 #ifndef AT_FDCWD
+# define AT_FDCWD (-3041965)
+#endif
+
 /* Use the same values as Solaris 9.  This shouldn't matter, but
    there's no real reason to differ.  */
-# define AT_FDCWD (-3041965)
+#ifndef AT_SYMLINK_NOFOLLOW
 # define AT_SYMLINK_NOFOLLOW 4096
 # define AT_REMOVEDIR 1
 #endif