mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 06:10:10 +00:00
b5567b2af6
2000-03-29 Jes Sorensen <jes@pcatls01.cern.ch>
* malloc/malloc.c: Declare bit flags UL so that they will not
default to int size when being inverted.
2000-03-29 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/arm/errlist.c: Use shlib-compat macros.
* sysdeps/unix/sysv/linux/arm/siglist.c: Likewise.
2000-03-29 Andreas Jaeger <aj@suse.de>,
Ralf Baechle <ralf@uni-koblenz.de>
* Makeconfig: Introduce new variable SHARED to mark code used in
the shared library.
* elf/dl-close.c: Use it instead of PIC.
* elf/dl-load.c: Likewise.
* elf/dl-open.c: Likewise.
* hurd/geteuids.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/shlib-compat.h: Likewise.
* libio/freopen.c: Likewise.
* linuxthreads/cancel.c: Likewise.
* linuxthreads/pthread.c: Likewise.
* linuxthreads/wrapsyscall.c: Likewise.
* nss/nsswitch.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
* sysdeps/arm/init-first.c: Likewise.
* sysdeps/i386/init-first.c: Likewise
* sysdeps/generic/init-first.c: Likewise.
* sysdeps/generic/libc-start.c: Likewise.
* sysdeps/mips/init-first.c: Likewise.
* sysdeps/powerpc/elf/libc-start.c: Likewise.
* sysdeps/unix/sysv/linux/init-first.c: Likewise.
* sysdeps/unix/sysv/linux/arm/siglist.c: Likewise.
* sysdeps/unix/sysv/linux/arm/errlist.c: Likewise.
* sysdeps/unix/sysv/linux/i386/chown.c: Likewise.
* sysdeps/mips/machine-gmon.h (asm): Use __PIC__ as check.
97 lines
3.1 KiB
C
97 lines
3.1 KiB
C
/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
This 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/* This file contains only wrappers around the real glob functions. It
|
|
became necessary since the glob_t structure changed. */
|
|
#include <sys/types.h>
|
|
#include <glob.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
|
|
|
|
/* This is the old structure. The difference is that the gl_pathc and
|
|
gl_offs elements have type `int'. */
|
|
typedef struct
|
|
{
|
|
int gl_pathc; /* Count of paths matched by the pattern. */
|
|
char **gl_pathv; /* List of matched pathnames. */
|
|
int 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 *);
|
|
struct dirent *(*gl_readdir) (void *);
|
|
__ptr_t (*gl_opendir) (__const char *);
|
|
int (*gl_lstat) (__const char *, struct stat *);
|
|
int (*gl_stat) (__const char *, struct stat *);
|
|
} old_glob_t;
|
|
|
|
|
|
int
|
|
__old_glob (const char *pattern, int flags,
|
|
int (*errfunc) __P ((const char *, int)),
|
|
old_glob_t *pglob)
|
|
{
|
|
glob_t correct;
|
|
int result;
|
|
|
|
/* Construct an object of correct type. */
|
|
correct.gl_pathc = pglob->gl_pathc;
|
|
correct.gl_pathv = pglob->gl_pathv;
|
|
correct.gl_offs = pglob->gl_offs;
|
|
correct.gl_flags = pglob->gl_flags;
|
|
correct.gl_closedir = pglob->gl_closedir;
|
|
correct.gl_readdir = pglob->gl_readdir;
|
|
correct.gl_opendir = pglob->gl_opendir;
|
|
correct.gl_lstat = pglob->gl_lstat;
|
|
correct.gl_stat = pglob->gl_stat;
|
|
|
|
result = glob (pattern, flags, errfunc, &correct);
|
|
|
|
/* And convert it back. */
|
|
pglob->gl_pathc = correct.gl_pathc;
|
|
pglob->gl_pathv = correct.gl_pathv;
|
|
pglob->gl_offs = correct.gl_offs;
|
|
pglob->gl_flags = correct.gl_flags;
|
|
pglob->gl_closedir = correct.gl_closedir;
|
|
pglob->gl_readdir = correct.gl_readdir;
|
|
pglob->gl_opendir = correct.gl_opendir;
|
|
pglob->gl_lstat = correct.gl_lstat;
|
|
pglob->gl_stat = correct.gl_stat;
|
|
|
|
return result;
|
|
}
|
|
compat_symbol (libc, __old_glob, glob, GLIBC_2_0);
|
|
|
|
|
|
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
|
void
|
|
__old_globfree (old_glob_t *pglob)
|
|
{
|
|
glob_t correct;
|
|
|
|
/* We only need these two symbols. */
|
|
correct.gl_pathc = pglob->gl_pathc;
|
|
correct.gl_pathv = pglob->gl_pathv;
|
|
|
|
globfree (&correct);
|
|
}
|
|
compat_symbol (libc, __old_globfree, globfree, GLIBC_2_0);
|
|
|
|
#endif
|