diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-21 06:42:29 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-21 06:42:29 +0000 |
| commit | 6870eeeaff70a3a2721126a54ea2c25b956cc198 (patch) | |
| tree | 7aed9becaf9649d49a3c553dd8dc8c174ba527c7 | |
| parent | 362e0d7bd1fc54dcfac9e16a324c6da25852e4dd (diff) | |
| download | coreutils-6870eeeaff70a3a2721126a54ea2c25b956cc198.tar.xz | |
(AT_FDCWD): Work around a bug in Solaris 9 and 10, where
AT_FDCWD exceeds INT_MAX.
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/getcwd.c | 10 | ||||
| -rw-r--r-- | lib/openat.h | 16 |
3 files changed, 30 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index a21612060..3756ac55c 100644 --- 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-17 Jim Meyering <jim@meyering.net> * openat.c: Include lstat.h, so that uses of lstat are converted diff --git a/lib/getcwd.c b/lib/getcwd.c index ec1771b83..5bb9e4be1 100644 --- 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 aa900c72e..017cf5cb0 100644 --- a/lib/openat.h +++ b/lib/openat.h @@ -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 |