mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 22:00:08 +00:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
174 lines
6.6 KiB
C
174 lines
6.6 KiB
C
/* Copyright (C) 1992-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#if !defined _SYS_STAT_H && !defined _FCNTL_H
|
|
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
|
|
#endif
|
|
|
|
#ifndef _BITS_STAT_H
|
|
#define _BITS_STAT_H 1
|
|
|
|
/* Versions of the `struct stat' data structure. */
|
|
#define _STAT_VER_LINUX_OLD 1
|
|
#define _STAT_VER_KERNEL 1
|
|
#define _STAT_VER_SVR4 2
|
|
#define _STAT_VER_LINUX 3
|
|
#define _STAT_VER _STAT_VER_LINUX /* The one defined below. */
|
|
|
|
/* Versions of the `xmknod' interface. */
|
|
#define _MKNOD_VER_LINUX 1
|
|
#define _MKNOD_VER_SVR4 2
|
|
#define _MKNOD_VER _MKNOD_VER_LINUX /* The bits defined below. */
|
|
|
|
|
|
struct stat
|
|
{
|
|
__dev_t st_dev; /* Device. */
|
|
#if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64
|
|
unsigned short int __pad1;
|
|
__ino_t st_ino; /* File serial number. */
|
|
#else
|
|
__ino64_t st_ino; /* File serial number. */
|
|
#endif
|
|
__mode_t st_mode; /* File mode. */
|
|
__nlink_t st_nlink; /* Link count. */
|
|
__uid_t st_uid; /* User ID of the file's owner. */
|
|
__gid_t st_gid; /* Group ID of the file's group.*/
|
|
__dev_t st_rdev; /* Device number, if device. */
|
|
unsigned short int __pad2;
|
|
#ifndef __USE_FILE_OFFSET64
|
|
__off_t st_size; /* Size of file, in bytes. */
|
|
#else
|
|
__off64_t st_size; /* Size of file, in bytes. */
|
|
#endif
|
|
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
|
|
|
#ifndef __USE_FILE_OFFSET64
|
|
__blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */
|
|
#else
|
|
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
|
#endif
|
|
#ifdef __USE_XOPEN2K8
|
|
/* Nanosecond resolution timestamps are stored in a format
|
|
equivalent to 'struct timespec'. This is the type used
|
|
whenever possible but the Unix namespace rules do not allow the
|
|
identifier 'timespec' to appear in the <sys/stat.h> header.
|
|
Therefore we have to handle the use of this header in strictly
|
|
standard-compliant sources special. */
|
|
struct timespec st_atim; /* Time of last access. */
|
|
struct timespec st_mtim; /* Time of last modification. */
|
|
struct timespec st_ctim; /* Time of last status change. */
|
|
# define st_atime st_atim.tv_sec /* Backward compatibility. */
|
|
# define st_mtime st_mtim.tv_sec
|
|
# define st_ctime st_ctim.tv_sec
|
|
#else
|
|
__time_t st_atime; /* Time of last access. */
|
|
unsigned long int st_atimensec; /* Nscecs of last access. */
|
|
__time_t st_mtime; /* Time of last modification. */
|
|
unsigned long int st_mtimensec; /* Nsecs of last modification. */
|
|
__time_t st_ctime; /* Time of last status change. */
|
|
unsigned long int st_ctimensec; /* Nsecs of last status change. */
|
|
#endif
|
|
unsigned long int __glibc_reserved4;
|
|
unsigned long int __glibc_reserved5;
|
|
};
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
struct stat64
|
|
{
|
|
__dev_t st_dev; /* Device. */
|
|
# if __WORDSIZE == 64
|
|
unsigned short int __pad1;
|
|
# endif
|
|
__ino64_t st_ino; /* File serial number. */
|
|
__mode_t st_mode; /* File mode. */
|
|
__nlink_t st_nlink; /* Link count. */
|
|
__uid_t st_uid; /* User ID of the file's owner. */
|
|
__gid_t st_gid; /* Group ID of the file's group.*/
|
|
__dev_t st_rdev; /* Device number, if device. */
|
|
unsigned short int __pad2;
|
|
__off64_t st_size; /* Size of file, in bytes. */
|
|
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
|
|
|
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
|
# ifdef __USE_XOPEN2K8
|
|
/* Nanosecond resolution timestamps are stored in a format
|
|
equivalent to 'struct timespec'. This is the type used
|
|
whenever possible but the Unix namespace rules do not allow the
|
|
identifier 'timespec' to appear in the <sys/stat.h> header.
|
|
Therefore we have to handle the use of this header in strictly
|
|
standard-compliant sources special. */
|
|
struct timespec st_atim; /* Time of last access. */
|
|
struct timespec st_mtim; /* Time of last modification. */
|
|
struct timespec st_ctim; /* Time of last status change. */
|
|
# define st_atime st_atim.tv_sec /* Backward compatibility. */
|
|
# define st_mtime st_mtim.tv_sec
|
|
# define st_ctime st_ctim.tv_sec
|
|
# else
|
|
__time_t st_atime; /* Time of last access. */
|
|
unsigned long int st_atimensec; /* Nscecs of last access. */
|
|
__time_t st_mtime; /* Time of last modification. */
|
|
unsigned long int st_mtimensec; /* Nsecs of last modification. */
|
|
__time_t st_ctime; /* Time of last status change. */
|
|
unsigned long int st_ctimensec; /* Nsecs of last status change. */
|
|
# endif
|
|
unsigned long int __glibc_reserved4;
|
|
unsigned long int __glibc_reserved5;
|
|
};
|
|
#endif
|
|
|
|
/* Tell code we have these members. */
|
|
#define _STATBUF_ST_BLKSIZE
|
|
#define _STATBUF_ST_RDEV
|
|
/* Nanosecond resolution time values are supported. */
|
|
#define _STATBUF_ST_NSEC
|
|
|
|
/* Encoding of the file mode. */
|
|
|
|
#define __S_IFMT 0170000 /* These bits determine file type. */
|
|
|
|
/* File types. */
|
|
#define __S_IFDIR 0040000 /* Directory. */
|
|
#define __S_IFCHR 0020000 /* Character device. */
|
|
#define __S_IFBLK 0060000 /* Block device. */
|
|
#define __S_IFREG 0100000 /* Regular file. */
|
|
#define __S_IFIFO 0010000 /* FIFO. */
|
|
#define __S_IFLNK 0120000 /* Symbolic link. */
|
|
#define __S_IFSOCK 0140000 /* Socket. */
|
|
|
|
/* POSIX.1b objects. Note that these macros always evaluate to zero. But
|
|
they do it by enforcing the correct use of the macros. */
|
|
#define __S_TYPEISMQ(buf) ((buf)->st_mode - (buf)->st_mode)
|
|
#define __S_TYPEISSEM(buf) ((buf)->st_mode - (buf)->st_mode)
|
|
#define __S_TYPEISSHM(buf) ((buf)->st_mode - (buf)->st_mode)
|
|
|
|
/* Protection bits. */
|
|
|
|
#define __S_ISUID 04000 /* Set user ID on execution. */
|
|
#define __S_ISGID 02000 /* Set group ID on execution. */
|
|
#define __S_ISVTX 01000 /* Save swapped text after use (sticky). */
|
|
#define __S_IREAD 0400 /* Read by owner. */
|
|
#define __S_IWRITE 0200 /* Write by owner. */
|
|
#define __S_IEXEC 0100 /* Execute by owner. */
|
|
|
|
#ifdef __USE_ATFILE
|
|
# define UTIME_NOW ((1l << 30) - 1l)
|
|
# define UTIME_OMIT ((1l << 30) - 2l)
|
|
#endif
|
|
|
|
#endif /* bits/stat.h */
|