mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 15:00:06 +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.
182 lines
6.5 KiB
C
182 lines
6.5 KiB
C
/* Copyright (C) 1991-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/>. */
|
|
|
|
#ifndef _GLOB_H
|
|
#define _GLOB_H 1
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* We need `size_t' for the following definitions. */
|
|
#ifndef __size_t
|
|
typedef __SIZE_TYPE__ __size_t;
|
|
# if defined __USE_XOPEN || __USE_XOPEN2K8
|
|
typedef __SIZE_TYPE__ size_t;
|
|
# endif
|
|
#else
|
|
/* The GNU CC stddef.h version defines __size_t as empty. We need a real
|
|
definition. */
|
|
# undef __size_t
|
|
# define __size_t size_t
|
|
#endif
|
|
|
|
/* Bits set in the FLAGS argument to `glob'. */
|
|
#define GLOB_ERR (1 << 0)/* Return on read errors. */
|
|
#define GLOB_MARK (1 << 1)/* Append a slash to each name. */
|
|
#define GLOB_NOSORT (1 << 2)/* Don't sort the names. */
|
|
#define GLOB_DOOFFS (1 << 3)/* Insert PGLOB->gl_offs NULLs. */
|
|
#define GLOB_NOCHECK (1 << 4)/* If nothing matches, return the pattern. */
|
|
#define GLOB_APPEND (1 << 5)/* Append to results of a previous call. */
|
|
#define GLOB_NOESCAPE (1 << 6)/* Backslashes don't quote metacharacters. */
|
|
#define GLOB_PERIOD (1 << 7)/* Leading `.' can be matched by metachars. */
|
|
|
|
#if !defined __USE_POSIX2 || defined __USE_MISC
|
|
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
|
|
# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
|
|
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
|
|
# define GLOB_NOMAGIC (1 << 11)/* If no magic chars, return the pattern. */
|
|
# define GLOB_TILDE (1 << 12)/* Expand ~user and ~ to home directories. */
|
|
# define GLOB_ONLYDIR (1 << 13)/* Match only directories. */
|
|
# define GLOB_TILDE_CHECK (1 << 14)/* Like GLOB_TILDE but return an error
|
|
if the user name is not available. */
|
|
# define __GLOB_FLAGS (GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
|
|
GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND| \
|
|
GLOB_PERIOD|GLOB_ALTDIRFUNC|GLOB_BRACE| \
|
|
GLOB_NOMAGIC|GLOB_TILDE|GLOB_ONLYDIR|GLOB_TILDE_CHECK)
|
|
#else
|
|
# define __GLOB_FLAGS (GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
|
|
GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND| \
|
|
GLOB_PERIOD)
|
|
#endif
|
|
|
|
/* Error returns from `glob'. */
|
|
#define GLOB_NOSPACE 1 /* Ran out of memory. */
|
|
#define GLOB_ABORTED 2 /* Read error. */
|
|
#define GLOB_NOMATCH 3 /* No matches found. */
|
|
#define GLOB_NOSYS 4 /* Not implemented. */
|
|
#ifdef __USE_GNU
|
|
/* Previous versions of this file defined GLOB_ABEND instead of
|
|
GLOB_ABORTED. Provide a compatibility definition here. */
|
|
# define GLOB_ABEND GLOB_ABORTED
|
|
#endif
|
|
|
|
/* Structure describing a globbing run. */
|
|
#ifdef __USE_GNU
|
|
struct stat;
|
|
#endif
|
|
typedef struct
|
|
{
|
|
__size_t gl_pathc; /* Count of paths matched by the pattern. */
|
|
char **gl_pathv; /* List of matched pathnames. */
|
|
__size_t gl_offs; /* Slots to reserve in `gl_pathv'. */
|
|
int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */
|
|
|
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
|
are used instead of the normal file access functions. */
|
|
void (*gl_closedir) (void *);
|
|
#ifdef __USE_GNU
|
|
struct dirent *(*gl_readdir) (void *);
|
|
#else
|
|
void *(*gl_readdir) (void *);
|
|
#endif
|
|
void *(*gl_opendir) (const char *);
|
|
#ifdef __USE_GNU
|
|
int (*gl_lstat) (const char *__restrict, struct stat *__restrict);
|
|
int (*gl_stat) (const char *__restrict, struct stat *__restrict);
|
|
#else
|
|
int (*gl_lstat) (const char *__restrict, void *__restrict);
|
|
int (*gl_stat) (const char *__restrict, void *__restrict);
|
|
#endif
|
|
} glob_t;
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
# ifdef __USE_GNU
|
|
struct stat64;
|
|
# endif
|
|
typedef struct
|
|
{
|
|
__size_t gl_pathc;
|
|
char **gl_pathv;
|
|
__size_t gl_offs;
|
|
int gl_flags;
|
|
|
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
|
are used instead of the normal file access functions. */
|
|
void (*gl_closedir) (void *);
|
|
# ifdef __USE_GNU
|
|
struct dirent64 *(*gl_readdir) (void *);
|
|
# else
|
|
void *(*gl_readdir) (void *);
|
|
# endif
|
|
void *(*gl_opendir) (const char *);
|
|
# ifdef __USE_GNU
|
|
int (*gl_lstat) (const char *__restrict, struct stat64 *__restrict);
|
|
int (*gl_stat) (const char *__restrict, struct stat64 *__restrict);
|
|
# else
|
|
int (*gl_lstat) (const char *__restrict, void *__restrict);
|
|
int (*gl_stat) (const char *__restrict, void *__restrict);
|
|
# endif
|
|
} glob64_t;
|
|
#endif
|
|
|
|
/* Do glob searching for PATTERN, placing results in PGLOB.
|
|
The bits defined above may be set in FLAGS.
|
|
If a directory cannot be opened or read and ERRFUNC is not nil,
|
|
it is called with the pathname that caused the error, and the
|
|
`errno' value from the failing call; if it returns non-zero
|
|
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
|
|
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
|
|
Otherwise, `glob' returns zero. */
|
|
#if !defined __USE_FILE_OFFSET64
|
|
extern int glob (const char *__restrict __pattern, int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob_t *__restrict __pglob) __THROW;
|
|
|
|
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
|
extern void globfree (glob_t *__pglob) __THROW;
|
|
#else
|
|
extern int __REDIRECT_NTH (glob, (const char *__restrict __pattern,
|
|
int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob_t *__restrict __pglob), glob64);
|
|
|
|
extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
|
|
#endif
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
extern int glob64 (const char *__restrict __pattern, int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob64_t *__restrict __pglob) __THROW;
|
|
|
|
extern void globfree64 (glob64_t *__pglob) __THROW;
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_GNU
|
|
/* Return nonzero if PATTERN contains any metacharacters.
|
|
Metacharacters can be quoted with backslashes if QUOTE is nonzero.
|
|
|
|
This function is not part of the interface specified by POSIX.2
|
|
but several programs want to use it. */
|
|
extern int glob_pattern_p (const char *__pattern, int __quote) __THROW;
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* glob.h */
|