mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
Update.
* posix/glob.h: Remove cruft to make header usable outside glibc. The maintenance headache is too big.
This commit is contained in:
parent
166151ff35
commit
5032f49422
@ -1,5 +1,8 @@
|
|||||||
2004-09-16 Ulrich Drepper <drepper@redhat.com>
|
2004-09-16 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* posix/glob.h: Remove cruft to make header usable outside glibc.
|
||||||
|
The maintenance headache is too big.
|
||||||
|
|
||||||
* configure.in: Add test for required SELinux features.
|
* configure.in: Add test for required SELinux features.
|
||||||
* config.make.in: Add have-selinux entry.
|
* config.make.in: Add have-selinux entry.
|
||||||
* config.h.in: Add HAVE_SELINUX entry.
|
* config.h.in: Add HAVE_SELINUX entry.
|
||||||
|
64
posix/glob.h
64
posix/glob.h
@ -19,35 +19,22 @@
|
|||||||
#ifndef _GLOB_H
|
#ifndef _GLOB_H
|
||||||
#define _GLOB_H 1
|
#define _GLOB_H 1
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#include <sys/cdefs.h>
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef __ptr_t
|
__BEGIN_DECLS
|
||||||
#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
|
|
||||||
# ifndef __GLIBC__
|
|
||||||
# if !defined __GNUC__ || __GNUC__ < 2
|
|
||||||
# undef __const
|
|
||||||
# define __const const
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# define __ptr_t void *
|
|
||||||
#else /* Not C++ or ANSI C. */
|
|
||||||
# undef __const
|
|
||||||
# define __const
|
|
||||||
# define __ptr_t char *
|
|
||||||
#endif /* C++ or ANSI C. */
|
|
||||||
|
|
||||||
/* We need `size_t' for the following definitions. */
|
/* We need `size_t' for the following definitions. */
|
||||||
#ifndef __size_t
|
#ifndef __size_t
|
||||||
# if defined __GNUC__ && __GNUC__ >= 2
|
# if defined __GNUC__ && __GNUC__ >= 2
|
||||||
typedef __SIZE_TYPE__ __size_t;
|
typedef __SIZE_TYPE__ __size_t;
|
||||||
# ifdef _XOPEN_SOURCE
|
# ifdef __USE_XOPEN
|
||||||
typedef __SIZE_TYPE__ size_t;
|
typedef __SIZE_TYPE__ size_t;
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
/* This is a guess. */
|
# include <stddef.h>
|
||||||
typedef unsigned long int __size_t;
|
# ifndef __size_t
|
||||||
|
# define __size_t size_t
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
/* The GNU CC stddef.h version defines __size_t as empty. We need a real
|
/* The GNU CC stddef.h version defines __size_t as empty. We need a real
|
||||||
@ -66,8 +53,7 @@ typedef unsigned long int __size_t;
|
|||||||
#define GLOB_NOESCAPE (1 << 6)/* Backslashes don't quote metacharacters. */
|
#define GLOB_NOESCAPE (1 << 6)/* Backslashes don't quote metacharacters. */
|
||||||
#define GLOB_PERIOD (1 << 7)/* Leading `.' can be matched by metachars. */
|
#define GLOB_PERIOD (1 << 7)/* Leading `.' can be matched by metachars. */
|
||||||
|
|
||||||
#if (!defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _BSD_SOURCE \
|
#if !defined __USE_POSIX2 || defined __USE_BSD || defined __USE_GNU
|
||||||
|| defined _GNU_SOURCE)
|
|
||||||
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
|
# 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_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
|
||||||
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
|
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
|
||||||
@ -91,17 +77,15 @@ typedef unsigned long int __size_t;
|
|||||||
#define GLOB_ABORTED 2 /* Read error. */
|
#define GLOB_ABORTED 2 /* Read error. */
|
||||||
#define GLOB_NOMATCH 3 /* No matches found. */
|
#define GLOB_NOMATCH 3 /* No matches found. */
|
||||||
#define GLOB_NOSYS 4 /* Not implemented. */
|
#define GLOB_NOSYS 4 /* Not implemented. */
|
||||||
#ifdef _GNU_SOURCE
|
#ifdef __USE_GNU
|
||||||
/* Previous versions of this file defined GLOB_ABEND instead of
|
/* Previous versions of this file defined GLOB_ABEND instead of
|
||||||
GLOB_ABORTED. Provide a compatibility definition here. */
|
GLOB_ABORTED. Provide a compatibility definition here. */
|
||||||
# define GLOB_ABEND GLOB_ABORTED
|
# define GLOB_ABEND GLOB_ABORTED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Structure describing a globbing run. */
|
/* Structure describing a globbing run. */
|
||||||
#if !defined _AMIGA && !defined VMS /* Buggy compiler. */
|
#ifdef __USE_GNU
|
||||||
# ifdef _GNU_SOURCE
|
|
||||||
struct stat;
|
struct stat;
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@ -113,13 +97,13 @@ typedef struct
|
|||||||
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
||||||
are used instead of the normal file access functions. */
|
are used instead of the normal file access functions. */
|
||||||
void (*gl_closedir) (void *);
|
void (*gl_closedir) (void *);
|
||||||
#ifdef _GNU_SOURCE
|
#ifdef __USE_GNU
|
||||||
struct dirent *(*gl_readdir) (void *);
|
struct dirent *(*gl_readdir) (void *);
|
||||||
#else
|
#else
|
||||||
void *(*gl_readdir) (void *);
|
void *(*gl_readdir) (void *);
|
||||||
#endif
|
#endif
|
||||||
__ptr_t (*gl_opendir) (__const char *);
|
void *(*gl_opendir) (__const char *);
|
||||||
#ifdef _GNU_SOURCE
|
#ifdef __USE_GNU
|
||||||
int (*gl_lstat) (__const char *__restrict, struct stat *__restrict);
|
int (*gl_lstat) (__const char *__restrict, struct stat *__restrict);
|
||||||
int (*gl_stat) (__const char *__restrict, struct stat *__restrict);
|
int (*gl_stat) (__const char *__restrict, struct stat *__restrict);
|
||||||
#else
|
#else
|
||||||
@ -128,8 +112,8 @@ typedef struct
|
|||||||
#endif
|
#endif
|
||||||
} glob_t;
|
} glob_t;
|
||||||
|
|
||||||
#ifdef _LARGEFILE64_SOURCE
|
#ifdef __USE_LARGEFILE64
|
||||||
# ifdef _GNU_SOURCE
|
# ifdef __USE_GNU
|
||||||
struct stat64;
|
struct stat64;
|
||||||
# endif
|
# endif
|
||||||
typedef struct
|
typedef struct
|
||||||
@ -142,13 +126,13 @@ typedef struct
|
|||||||
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
||||||
are used instead of the normal file access functions. */
|
are used instead of the normal file access functions. */
|
||||||
void (*gl_closedir) (void *);
|
void (*gl_closedir) (void *);
|
||||||
# ifdef _GNU_SOURCE
|
# ifdef __USE_GNU
|
||||||
struct dirent64 *(*gl_readdir) (void *);
|
struct dirent64 *(*gl_readdir) (void *);
|
||||||
# else
|
# else
|
||||||
void *(*gl_readdir) (void *);
|
void *(*gl_readdir) (void *);
|
||||||
# endif
|
# endif
|
||||||
__ptr_t (*gl_opendir) (__const char *);
|
void *(*gl_opendir) (__const char *);
|
||||||
# ifdef _GNU_SOURCE
|
# ifdef __USE_GNU
|
||||||
int (*gl_lstat) (__const char *__restrict, struct stat64 *__restrict);
|
int (*gl_lstat) (__const char *__restrict, struct stat64 *__restrict);
|
||||||
int (*gl_stat) (__const char *__restrict, struct stat64 *__restrict);
|
int (*gl_stat) (__const char *__restrict, struct stat64 *__restrict);
|
||||||
# else
|
# else
|
||||||
@ -158,7 +142,7 @@ typedef struct
|
|||||||
} glob64_t;
|
} glob64_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if _FILE_OFFSET_BITS == 64 && __GNUC__ < 2
|
#if __USE_FILE_OFFSET64 && __GNUC__ < 2
|
||||||
# define glob glob64
|
# define glob glob64
|
||||||
# define globfree globfree64
|
# define globfree globfree64
|
||||||
#endif
|
#endif
|
||||||
@ -171,7 +155,7 @@ typedef struct
|
|||||||
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
|
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
|
||||||
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
|
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
|
||||||
Otherwise, `glob' returns zero. */
|
Otherwise, `glob' returns zero. */
|
||||||
#if _FILE_OFFSET_BITS != 64 || __GNUC__ < 2
|
#if !defined __USE_FILE_OFFSET64 || __GNUC__ < 2
|
||||||
extern int glob (__const char *__restrict __pattern, int __flags,
|
extern int glob (__const char *__restrict __pattern, int __flags,
|
||||||
int (*__errfunc) (__const char *, int),
|
int (*__errfunc) (__const char *, int),
|
||||||
glob_t *__restrict __pglob) __THROW;
|
glob_t *__restrict __pglob) __THROW;
|
||||||
@ -187,7 +171,7 @@ extern int __REDIRECT_NTH (glob, (__const char *__restrict __pattern,
|
|||||||
extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
|
extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _LARGEFILE64_SOURCE
|
#ifdef __USE_LARGEFILE64
|
||||||
extern int glob64 (__const char *__restrict __pattern, int __flags,
|
extern int glob64 (__const char *__restrict __pattern, int __flags,
|
||||||
int (*__errfunc) (__const char *, int),
|
int (*__errfunc) (__const char *, int),
|
||||||
glob64_t *__restrict __pglob) __THROW;
|
glob64_t *__restrict __pglob) __THROW;
|
||||||
@ -196,7 +180,7 @@ extern void globfree64 (glob64_t *__pglob) __THROW;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef _GNU_SOURCE
|
#ifdef __USE_GNU
|
||||||
/* Return nonzero if PATTERN contains any metacharacters.
|
/* Return nonzero if PATTERN contains any metacharacters.
|
||||||
Metacharacters can be quoted with backslashes if QUOTE is nonzero.
|
Metacharacters can be quoted with backslashes if QUOTE is nonzero.
|
||||||
|
|
||||||
@ -205,8 +189,6 @@ extern void globfree64 (glob64_t *__pglob) __THROW;
|
|||||||
extern int glob_pattern_p (__const char *__pattern, int __quote) __THROW;
|
extern int glob_pattern_p (__const char *__pattern, int __quote) __THROW;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
__END_DECLS
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* glob.h */
|
#endif /* glob.h */
|
||||||
|
Loading…
Reference in New Issue
Block a user