mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
Update.
* posix/wordexp.h: Correct definition of wordexp_t. * posix/wordexp.c: Moved to ... * sysdeps/generic/wordexp.c: ...here. New file. * sysdeps/unix/sysv/linux/alpha/wordexp.c: New file. * sysdeps/unix/sysv/linux/ia64/wordexp.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c: New file. * sysdeps/unix/sysv/linux/alpha/Versions [libc] (GLIBC_2.2.2): Add wordexp. * sysdeps/unix/sysv/linux/ia64/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/Versions: Likewise.
This commit is contained in:
parent
deea1b2970
commit
8a6c22174e
11
ChangeLog
11
ChangeLog
@ -1,5 +1,16 @@
|
||||
2001-01-25 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* posix/wordexp.h: Correct definition of wordexp_t.
|
||||
* posix/wordexp.c: Moved to ...
|
||||
* sysdeps/generic/wordexp.c: ...here. New file.
|
||||
* sysdeps/unix/sysv/linux/alpha/wordexp.c: New file.
|
||||
* sysdeps/unix/sysv/linux/ia64/wordexp.c: New file.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c: New file.
|
||||
* sysdeps/unix/sysv/linux/alpha/Versions [libc] (GLIBC_2.2.2): Add
|
||||
wordexp.
|
||||
* sysdeps/unix/sysv/linux/ia64/Versions: Likewise.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/Versions: Likewise.
|
||||
|
||||
* math/tgmath.h: Pretty printing.
|
||||
|
||||
* math/Makefile (tests): Add test-tgmath.
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 92, 96, 97, 98, 99 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2001 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
|
||||
@ -20,6 +20,8 @@
|
||||
#define _WORDEXP_H 1
|
||||
|
||||
#include <features.h>
|
||||
#define __need_size_t
|
||||
#include <stddef.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
@ -39,9 +41,9 @@ enum
|
||||
/* Structure describing a word-expansion run. */
|
||||
typedef struct
|
||||
{
|
||||
int we_wordc; /* Count of words matched. */
|
||||
size_t we_wordc; /* Count of words matched. */
|
||||
char **we_wordv; /* List of expanded words. */
|
||||
int we_offs; /* Slots to reserve in `we_wordv'. */
|
||||
size_t we_offs; /* Slots to reserve in `we_wordv'. */
|
||||
} wordexp_t;
|
||||
|
||||
/* Possible nonzero return values from `wordexp'. */
|
||||
|
@ -54,4 +54,8 @@ libc {
|
||||
GLIBC_2.1.4 {
|
||||
pciconfig_iobase;
|
||||
}
|
||||
GLIBC_2.2.2 {
|
||||
# w*
|
||||
wordexp;
|
||||
}
|
||||
}
|
||||
|
59
sysdeps/unix/sysv/linux/alpha/wordexp.c
Normal file
59
sysdeps/unix/sysv/linux/alpha/wordexp.c
Normal file
@ -0,0 +1,59 @@
|
||||
/* Copyright (C) 2001 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 Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C 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. */
|
||||
|
||||
#include <shlib-compat.h>
|
||||
|
||||
/* For Linux/Alpha we have to make the wordexp symbols versioned. */
|
||||
#define wordexp(words, pwordexp, flags) \
|
||||
__new_wordexp (words, pwordexp, flags)
|
||||
|
||||
#include <sysdeps/generic/wordexp.c>
|
||||
|
||||
versioned_symbol (libc, __new_wordexp, wordexp, GLIBC_2_2_2);
|
||||
|
||||
|
||||
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2_2)
|
||||
/* The old, incorrect wordexp_t definition. */
|
||||
typedef struct
|
||||
{
|
||||
int we_wordc; /* Count of words matched. */
|
||||
char **we_wordv; /* List of expanded words. */
|
||||
int we_offs; /* Slots to reserve in `we_wordv'. */
|
||||
} old_wordexp_t;
|
||||
|
||||
|
||||
int
|
||||
__old_wordexp (const char *words, old_wordexp_t *pwordexp, int flags)
|
||||
{
|
||||
wordexp_t we;
|
||||
int result;
|
||||
|
||||
we.we_wordc = pwordexp->we_wordc;
|
||||
we.we_wordv = pwordexp->we_wordv;
|
||||
we.we_offs = pwordexp->we_offs;
|
||||
|
||||
result = __new_wordexp (words, &we, flags);
|
||||
|
||||
pwordexp->we_wordc = we.we_wordc;
|
||||
pwordexp->we_wordv = we.we_wordv;
|
||||
pwordexp->we_offs = we.we_offs;
|
||||
|
||||
return result;
|
||||
}
|
||||
compat_symbol (libc, __old_wordexp, wordexp, GLIBC_2_1);
|
||||
#endif
|
@ -19,4 +19,8 @@ libc {
|
||||
# linuxthreads
|
||||
__clone2;
|
||||
}
|
||||
GLIBC_2.2.2 {
|
||||
# w*
|
||||
wordexp;
|
||||
}
|
||||
}
|
||||
|
1
sysdeps/unix/sysv/linux/ia64/wordexp.c
Normal file
1
sysdeps/unix/sysv/linux/ia64/wordexp.c
Normal file
@ -0,0 +1 @@
|
||||
#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>
|
@ -5,4 +5,8 @@ libc {
|
||||
__register_frame_info; __deregister_frame_info; __frame_state_for;
|
||||
__register_frame_info_table;
|
||||
}
|
||||
GLIBC_2.2.2 {
|
||||
# w*
|
||||
wordexp;
|
||||
}
|
||||
}
|
||||
|
1
sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c
Normal file
1
sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c
Normal file
@ -0,0 +1 @@
|
||||
#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>
|
Loading…
Reference in New Issue
Block a user