ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/expandarg.c

Comparing ray/src/common/expandarg.c (file contents):
Revision 2.7 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.9 by greg, Sat May 17 02:49:41 2008 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include "copyright.h"
11
12	<	#include "rtio.h"
12	>	#include <errno.h>
13	>	#include <string.h>
14
15	+	#include "rtio.h"
16		#include "rtmisc.h"
17
16	–	#include <errno.h>
18
19	<	#define MAXARGEXP       512             /* maximum argument expansion */
19	>	#define MAXARGEXP       4096            /* maximum argument expansion */
20
21		/* set the following to suit, -1 to disable */
22		int     envexpchr = '$';                /* environment expansion character */
#	Line 50 | Line 51 | int    n;
51		if (newav == NULL)
52		return(-1);
53		/* copy preceeding arguments */
54	<	bcopy((void *)*avp, (void *)newav, n*sizeof(char *));
54	>	memcpy((void *)newav, (void *)*avp, n*sizeof(char *));
55		/* copy expanded argument */
56	<	bcopy((void *)ave, (void *)(newav+n), ace*sizeof(char *));
56	>	memcpy((void *)(newav+n), (void *)ave, ace*sizeof(char *));
57		/* copy trailing arguments + NULL */
58	<	bcopy((void *)(*avp+n+1), (void *)(newav+n+ace), (*acp-n)*sizeof(char *));
58	>	memcpy((void *)(newav+n+ace), (void *)(*avp+n+1), (*acp-n)*sizeof(char *));
59		/* free old list */
60		bfree((char *)*avp, (*acp+1)*sizeof(char *));
61		/* assign new list */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)