Correct definition of wordexp_t.

This commit is contained in:
Ulrich Drepper 2001-01-26 02:16:03 +00:00
parent 582f2b191d
commit 2b0edb5a1e

View 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