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.

9 files changed, 89 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a7fa58467..1bc16524b8 100644
--- a/ChangeLog
+++ b/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.
diff --git a/posix/wordexp.h b/posix/wordexp.h
index 14840f6e3e..8c2f4dfc64 100644
--- a/posix/wordexp.h
+++ b/posix/wordexp.h
@@ -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'.  */
diff --git a/posix/wordexp.c b/sysdeps/generic/wordexp.c
index 82765e1820..82765e1820 100644
--- a/posix/wordexp.c
+++ b/sysdeps/generic/wordexp.c
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index 0e6e519dd2..d89ef6a061 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -54,4 +54,8 @@ libc {
   GLIBC_2.1.4 {
     pciconfig_iobase;
   }
+  GLIBC_2.2.2 {
+    # w*
+    wordexp;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/alpha/wordexp.c b/sysdeps/unix/sysv/linux/alpha/wordexp.c
new file mode 100644
index 0000000000..d7ae6dd1a9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/wordexp.c
@@ -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
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions
index 5f3b6a589f..e307eca3b1 100644
--- a/sysdeps/unix/sysv/linux/ia64/Versions
+++ b/sysdeps/unix/sysv/linux/ia64/Versions
@@ -19,4 +19,8 @@ libc {
     # linuxthreads
     __clone2;
   }
+  GLIBC_2.2.2 {
+    # w*
+    wordexp;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/ia64/wordexp.c b/sysdeps/unix/sysv/linux/ia64/wordexp.c
new file mode 100644
index 0000000000..2e3d5bc2e9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/wordexp.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions
index 2d3061bad5..65349501fe 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions
@@ -5,4 +5,8 @@ libc {
     __register_frame_info; __deregister_frame_info; __frame_state_for;
     __register_frame_info_table;
   }
+  GLIBC_2.2.2 {
+    # w*
+    wordexp;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c b/sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c
new file mode 100644
index 0000000000..2e3d5bc2e9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/wordexp.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/wordexp.c>