diff options
-rw-r--r-- | bin/csh/Makefile | 10 | ||||
-rw-r--r-- | bin/csh/csh.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 00c8c8f..0dc44c5 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 1997/02/22 14:01:36 peter Exp $ +# $Id: Makefile,v 1.8 1997/08/07 21:42:01 steve Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -32,10 +32,10 @@ errnum.h: err.c @echo '#endif /* _h_sh_error */' >> ${.TARGET} const.h: const.c - @rm -f $@ - @echo '/* Do not edit this file, make creates it. */' > $@ - ${CC} -E ${CFLAGS} ${.CURDIR}/$*.c | egrep 'Char STR' | \ + @rm -f ${.TARGET} + @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} + ${CC} -E ${CFLAGS} ${.ALLSRC} | egrep 'Char STR' | \ sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ - sort >> $@ + sort >> ${.TARGET} .include <bsd.prog.mk> diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 26a1c1d..29fbf5e 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else static const char rcsid[] = - "$Id: csh.c,v 1.8 1997/02/22 14:01:41 peter Exp $"; + "$Id: csh.c,v 1.9 1997/08/07 21:42:03 steve Exp $"; #endif #endif /* not lint */ @@ -734,7 +734,7 @@ srcunit(unit, onlyown, hflg) if (setintr) omask = sigblock(sigmask(SIGINT)); /* Setup the new values of the state stuff saved above */ - memcpy((char *) &(saveB), (char *) &B, sizeof(B)); + memmove((char *) &(saveB), (char *) &B, sizeof(B)); fbuf = NULL; fseekp = feobp = fblocks = 0; oSHIN = SHIN, SHIN = unit, arginp = 0, onelflg = 0; @@ -768,7 +768,7 @@ srcunit(unit, onlyown, hflg) xfree((ptr_t) fbuf); /* Reset input arena */ - memcpy((char *) &B, (char *) &(saveB), sizeof(B)); + memmove((char *) &B, (char *) &(saveB), sizeof(B)); (void) close(SHIN), SHIN = oSHIN; arginp = oarginp, onelflg = oonelflg; |