about summary refs log tree commit diff
path: root/posix/wordexp.c
diff options
context:
space:
mode:
Diffstat (limited to 'posix/wordexp.c')
-rw-r--r--posix/wordexp.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 1922e44642..52869fe1d3 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1992, 1997 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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <ansidecl.h>
 #include <sys/types.h>
 #include <wordexp.h>
 #include <stdio.h>
@@ -43,8 +42,10 @@ Cambridge, MA 02139, USA.  */
 
 
 int
-DEFUN(wordexp, (string, pwordexp, flags),
-      CONST char *string AND wordexp_t *pwordexp AND int flags)
+wordexp (string, pwordexp, flags)
+     const char *string;
+     wordexp_t *pwordexp;
+     int flags;
 {
   int error;
   pid_t pid;
@@ -67,7 +68,7 @@ DEFUN(wordexp, (string, pwordexp, flags),
     {
       /* Child.  Run the shell.  */
 
-      CONST char *argv[5];
+      const char *argv[5];
 
       close (d[STDIN_FILENO]);
       dup2 (d[STDOUT_FILENO], STDOUT_FILENO);
@@ -132,7 +133,7 @@ DEFUN(wordexp, (string, pwordexp, flags),
   wordc = start + wordc + 1;
 
   if (flags & WRDE_APPEND)
-    wordv = (char **) realloc ((PTR) pwordexp->we_wordv,
+    wordv = (char **) realloc ((void *) pwordexp->we_wordv,
 			       wordc * sizeof (char *));
   else
     wordv = (char **) malloc (wordc * sizeof (char *));