lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Fix definition and testing of S_ISSOCK.

Browse Source
This commit is contained in:
Ulrich Drepper
2010-04-04 01:51:01 -07:00
parent 9e37946dba
commit 952df0afdc
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2010-04-04 Ulrich Drepper <drepper@redhat.com> 2010-04-04 Ulrich Drepper <drepper@redhat.com>
* conform/data/sys/stat.h-data: Fix testing of S_IS* macros.
[BZ #11279]
* io/sys/stat.h: Always define S_ISSOCK for XPG6 and up.
[BZ #11287] [BZ #11287]
* csu/Makefile ($(objpfx)version-info.h): Handle newer kernel headers * csu/Makefile ($(objpfx)version-info.h): Handle newer kernel headers
which don't define UTS_RELEASE. which don't define UTS_RELEASE.

5
conform/data/sys/stat.h-data
View File

@@ -66,15 +66,14 @@ constant S_ISGID
constant S_ISVTX constant S_ISVTX
#endif #endif
#if !defined POSIX && !defined POSIX2008 #if !defined POSIX
macro S_IFMT
macro S_ISBLK macro S_ISBLK
macro S_ISCHR macro S_ISCHR
macro S_ISDIR macro S_ISDIR
macro S_ISFIFO macro S_ISFIFO
macro S_ISREG macro S_ISREG
macro S_ISLNK macro S_ISLNK
macro S_IFSOCK macro S_ISSOCK
#endif #endif
// How to represent optional tests? // How to represent optional tests?

6
io/sys/stat.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009 /* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009, 2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@@ -143,9 +143,11 @@ __BEGIN_DECLS
# define S_ISLNK(mode) 0 # define S_ISLNK(mode) 0
#endif #endif
#if (defined __USE_BSD || defined __USE_UNIX98) \ #if (defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K) \
&& defined __S_IFSOCK && defined __S_IFSOCK
# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) # define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
#elif defined __USE_XOPEN2K
# define S_ISSOCK(mode) 0
#endif #endif
/* These are from POSIX.1b. If the objects are not implemented using separate /* These are from POSIX.1b. If the objects are not implemented using separate