``mv'' -> ``mv -f''

``rm'' -> ``rm -f''
so mv/rm may not ask for confirmation if you are not root

2 files changed, 18 insertions, 16 deletions

diff --git a/lib/libc_r/string/Makefile.inc b/lib/libc_r/string/Makefile.inc
index 861fdf7..1296824 100644
--- a/lib/libc_r/string/Makefile.inc
+++ b/lib/libc_r/string/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id: $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
 
@@ -16,12 +17,12 @@ OBJS+=	bzero.o
 bzero.o: memset.c
 	${CC} -DBZERO ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 bzero.po: memset.c
 	${CC} -DBZERO ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memmove(3), build one out of bcopy(3).
@@ -30,12 +31,12 @@ OBJS+=	memmove.o
 memmove.o: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memmove.po: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific memcpy(3), build one out of bcopy(3).
@@ -44,12 +45,12 @@ OBJS+=	memcpy.o
 memcpy.o: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 memcpy.po: bcopy.c
 	${CC} -DMEMCOPY ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strchr(3), build one out of index(3).
@@ -58,12 +59,12 @@ OBJS+=	strchr.o
 strchr.o: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strchr.po: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
 
 # If no machine specific strrchr(3), build one out of rindex(3).
@@ -72,10 +73,10 @@ OBJS+=	strrchr.o
 strrchr.o: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
 	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 
 strrchr.po: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
 	@${LD} -X -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@mv -f a.out ${.TARGET}
 .endif
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index 0133541..3aa9a00 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
+#	$Id: $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys \
@@ -48,7 +49,7 @@ ${ASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PASM=	${ASM:.o=.po}
 ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -56,7 +57,7 @@ ${PASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SASM=	${ASM:.o=.so}
 ${SASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -69,7 +70,7 @@ ${THREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PTHREADASM=	${THREADASM:.o=.po}
 ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -77,7 +78,7 @@ ${PTHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX},_thread_sys_${.PREFIX})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 STHREADASM=	${THREADASM:.o=.so}
 ${STHREADASM}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -90,7 +91,7 @@ ${PSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.o
 	@${LD} -x -r ${.PREFIX}.o
-	@mv a.out ${.PREFIX}.o
+	@mv -f a.out ${.PREFIX}.o
 
 PPSEUDO=${PSEUDO:.o=.po}
 ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
@@ -98,7 +99,7 @@ ${PPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h
 	@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
 	    ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.PREFIX}.po
 	@${LD} -x -r ${.PREFIX}.po
-	@mv a.out ${.PREFIX}.po
+	@mv -f a.out ${.PREFIX}.po
 
 SPSEUDO=${PSEUDO:.o=.so}
 ${SPSEUDO}: ${.CURDIR}/../libc/${MACHINE}/SYS.h /usr/include/sys/syscall.h