mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 06:21:07 +00:00
d3a4a571c4
2004-03-10 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h [__ASSEMBLY__] (compat_text_section, compat_data_section): Define. * sysdeps/unix/sysv/linux/alpha/adjtime.c (ADJTIME): Add attribute_compat_text_section. * sysdeps/unix/sysv/linux/alpha/wordexp.c (__old_wordexp): Likewise. * sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob, __old_globfree): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/chown.c (__chown_is_lchown): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/posix_fadvise64.c (__posix_fadvise64_l32): Likewise. * sysdeps/unix/sysv/linux/msgctl.c (__old_msgctl): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c (__posix_fadvise64_l32): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c (__old_semctl): Likewise. * sysdeps/unix/sysv/linux/semctl.c (__old_semctl): Likewise. * sysdeps/unix/sysv/linux/posix_fadvise64.c (__posix_fadvise64_l32): Likewise. * sysdeps/unix/sysv/linux/shmctl.c (__old_shmctl): Likewise. * hurd/compat-20.c (_hurd_proc_init_compat_20): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S (__swapcontext, __novec_swapcontext): Use END instead of PSEUDO_END. (__novec_swapcontext, __swapcontext_stub): Add compat_text_section. * sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S (__makecontext_stub): Likewise. (__novec_makecontext): Likewise. Fix name in END () to match function name. * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S (__setcontext): Use END instead of PSEUDO_END. (__novec_setcontext): Add compat_text_section. Use END instead of PSEUDO_END, fix the name in END () to match function name. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S (__getcontext, __novec_getcontext): Use END instead of PSEUDO_END. (__novec_getcontext, __getcontext_stub): Add compat_text_section. 2004-03-10 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h: Don't use GL macro if not appropriate. (COPY_UNALIGNED_WORD): Remove cast used as lvalue. 2004-03-10 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/dl-procinfo.h (HWCAP_IMPORTANT): Remove mmx, add sse2.
100 lines
3.2 KiB
C
100 lines
3.2 KiB
C
/* Copyright (C) 1998, 2000, 2004 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, 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
|
|
attribute_compat_text_section
|
|
__old_glob (const char *pattern, int flags,
|
|
int (*errfunc) (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
|
|
attribute_compat_text_section
|
|
__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
|