--- ray/src/common/expandarg.c	2003/02/25 02:47:21	2.5
+++ ray/src/common/expandarg.c	2003/06/30 14:59:11	2.8
@@ -1,16 +1,21 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: expandarg.c,v 2.5 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: expandarg.c,v 2.8 2003/06/30 14:59:11 schorsch Exp $";
 #endif
 /*
  * Get additional command arguments from file or environment.
  *
- *  External symbols declared in standard.h
+ *  External symbols declared in rtio.h
  */
 
 #include "copyright.h"
 
-#include "standard.h"
+#include <errno.h>
+#include <string.h>
 
+#include "rtio.h"
+#include "rtmisc.h"
+
+
 #define MAXARGEXP	512		/* maximum argument expansion */
 
 			/* set the following to suit, -1 to disable */
@@ -46,11 +51,11 @@ int	n;
 	if (newav == NULL)
 		return(-1);
 					/* copy preceeding arguments */
-	bcopy((char *)*avp, (char *)newav, n*sizeof(char *));
+	memcpy((void *)newav, (void *)*avp, n*sizeof(char *));
 					/* copy expanded argument */
-	bcopy((char *)ave, (char *)(newav+n), ace*sizeof(char *));
+	memcpy((void *)(newav+n), (void *)ave, ace*sizeof(char *));
 					/* copy trailing arguments + NULL */
-	bcopy((char *)(*avp+n+1), (char *)(newav+n+ace), (*acp-n)*sizeof(char *));
+	memcpy((void *)(newav+n+ace), (void *)(*avp+n+1), (*acp-n)*sizeof(char *));
 					/* free old list */
 	bfree((char *)*avp, (*acp+1)*sizeof(char *));
 					/* assign new list */