Mercurial > hg > octave-kai > gnulib-hg
changeset 6647:ca74ccfe8d1b
* getcwd.c (AT_FDCWD): Work around a bug in Solaris 9 and 10, where
AT_FDCWD exceeds INT_MAX.
* openat.h (AT_FDCWD): Likewise.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 21 Feb 2006 06:40:34 +0000 |
parents | c8acef83bf3f |
children | c38e86f79bc1 |
files | lib/ChangeLog lib/getcwd.c lib/openat.h |
diffstat | 3 files changed, 31 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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