--- ray/src/common/expandarg.c	1992/11/08 16:23:17	2.2
+++ ray/src/common/expandarg.c	2003/05/13 17:58:32	2.6
@@ -1,22 +1,24 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: expandarg.c,v 2.6 2003/05/13 17:58:32 greg Exp $";
 #endif
-
 /*
  * Get additional command arguments from file or environment.
+ *
+ *  External symbols declared in standard.h
  */
 
+#include "copyright.h"
+
 #include "standard.h"
 
 #define MAXARGEXP	512		/* maximum argument expansion */
 
 			/* set the following to suit, -1 to disable */
 int	envexpchr = '$';		/* environment expansion character */
-int	filexpchr = '^';		/* file expansion character */
+int	filexpchr = '@';		/* file expansion character */
 
 
+int
 expandarg(acp, avp, n)		/* expand list at argument n */
 int	*acp;
 register char	***avp;
@@ -44,11 +46,11 @@ int	n;
 	if (newav == NULL)
 		return(-1);
 					/* copy preceeding arguments */
-	bcopy((char *)*avp, (char *)newav, n*sizeof(char *));
+	bcopy((void *)*avp, (void *)newav, n*sizeof(char *));
 					/* copy expanded argument */
-	bcopy((char *)ave, (char *)(newav+n), ace*sizeof(char *));
+	bcopy((void *)ave, (void *)(newav+n), ace*sizeof(char *));
 					/* copy trailing arguments + NULL */
-	bcopy((char *)(*avp+n+1), (char *)(newav+n+ace), (*acp-n)*sizeof(char *));
+	bcopy((void *)(*avp+n+1), (void *)(newav+n+ace), (*acp-n)*sizeof(char *));
 					/* free old list */
 	bfree((char *)*avp, (*acp+1)*sizeof(char *));
 					/* assign new list */