Index: distrib/alpha/iso/Makefile
===================================================================
RCS file: /cvs/src/distrib/alpha/iso/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- distrib/alpha/iso/Makefile 1 May 2019 20:53:34 -0000 1.20
+++ distrib/alpha/iso/Makefile 10 Oct 2022 18:13:37 -0000
@@ -42,8 +42,8 @@ ${CDROM}: ${BASE} ${XBASE}
vnconfig -v ${CDROM} > vnd
mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
/usr/mdec/installboot -v \
- -s `cat log | grep -v 'Name' | egrep
"/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
- -e `cat log | grep -v 'Name' | egrep
"/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
+ -s `grep -v 'Name' log | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$"
| cut -d' ' -f1` \
+ -e `grep -v 'Name' log | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$"
| cut -d' ' -f2` \
${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
umount ${MOUNT_POINT}
vnconfig -u `cat vnd`
Index: distrib/alpha/miniroot/Makefile
===================================================================
RCS file: /cvs/src/distrib/alpha/miniroot/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- distrib/alpha/miniroot/Makefile 26 Jul 2021 12:47:44 -0000 1.23
+++ distrib/alpha/miniroot/Makefile 10 Oct 2022 18:13:37 -0000
@@ -54,8 +54,8 @@ ${CDROM}: bsd.gz
vnconfig -v ${CDROM} > vnd
mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
/usr/mdec/installboot -v \
- -s `cat log | grep -v 'Name' | egrep
"/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
- -e `cat log | grep -v 'Name' | egrep
"/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
+ -s `grep -v 'Name' log | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$"
| cut -d' ' -f1` \
+ -e `grep -v 'Name' log | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$"
| cut -d' ' -f2` \
${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
umount ${MOUNT_POINT}
vnconfig -u `cat vnd`
Index: distrib/miniroot/install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.1211
diff -u -p -r1.1211 install.sub
--- distrib/miniroot/install.sub 10 Oct 2022 11:04:17 -0000 1.1211
+++ distrib/miniroot/install.sub 10 Oct 2022 18:13:38 -0000
@@ -1816,7 +1816,7 @@ install_http() {
;;
"?") [[ -s $HTTP_LIST ]] || continue
# Show a numbered list of mirror servers.
- cat -n < $HTTP_LIST | more -c
+ cat -n $HTTP_LIST | more -c
;;
+([0-9]))
# A number is only used as a line number in $HTTP_LIST.
Index: distrib/sets/maketars
===================================================================
RCS file: /cvs/src/distrib/sets/maketars,v
retrieving revision 1.26
diff -u -p -r1.26 maketars
--- distrib/sets/maketars 17 Apr 2017 19:44:59 -0000 1.26
+++ distrib/sets/maketars 10 Oct 2022 18:13:38 -0000
@@ -63,9 +63,9 @@ for i in base comp game man; do
cat ${lists}/$i/clang.${arch} >> $TMP2
fi
sort $TMP2 > $TMP
- cat $TMP | grep '^./usr/lib/lib' > $TMP2
- cat $TMP | grep -v '^./usr/lib/lib' >> $TMP2
- cat $TMP2 | pax -w -d | gzip > ${tardir}/$i${RELEASE}.tgz
+ grep '^./usr/lib/lib' $TMP > $TMP2
+ grep -v '^./usr/lib/lib' $TMP >> $TMP2
+ pax -w -d < $TMP2 | gzip > ${tardir}/$i${RELEASE}.tgz
echo "done."
done
rm -f $TMP $TMP2
Index: distrib/special/disklabel/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/disklabel/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- distrib/special/disklabel/Makefile 21 Sep 2021 18:36:09 -0000 1.13
+++ distrib/special/disklabel/Makefile 10 Oct 2022 18:13:38 -0000
@@ -21,7 +21,7 @@ disklabel.cat8: disklabel.8
manual.c: disklabel.cat8
(echo 'const unsigned char manpage[] = {'; \
- cat disklabel.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
+ gzip -9c < disklabel.cat8 | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.endif
Index: distrib/special/fdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fdisk/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- distrib/special/fdisk/Makefile 23 May 2022 16:58:11 -0000 1.6
+++ distrib/special/fdisk/Makefile 10 Oct 2022 18:13:38 -0000
@@ -34,7 +34,7 @@ fdisk.cat8: fdisk.8
manual.c: fdisk.cat8
(echo 'const unsigned char manpage[] = {'; \
- cat fdisk.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
+ gzip -9c < fdisk.cat8 | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.endif
Index: lib/libssl/test/test_aesni
===================================================================
RCS file: /cvs/src/lib/libssl/test/test_aesni,v
retrieving revision 1.1
diff -u -p -r1.1 test_aesni
--- lib/libssl/test/test_aesni 1 Jul 2010 17:44:20 -0000 1.1
+++ lib/libssl/test/test_aesni 10 Oct 2022 18:13:53 -0000
@@ -15,8 +15,7 @@ else
fi
if $PROG engine aesni | grep -v no-aesni; then
-
- HASH=`cat $PROG | $PROG dgst -hex`
+ HASH=`$PROG dgst -hex <$PROG`
AES_ALGS=" aes-128-ecb aes-192-ecb aes-256-ecb \
aes-128-cbc aes-192-cbc aes-256-cbc \
@@ -29,8 +28,8 @@ if $PROG engine aesni | grep -v no-aesni
for alg in $AES_ALGS; do
echo $alg
for bufsize in $BUFSIZE; do
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg -bufsize $bufsize -engine aesni |
\
+ TEST=`( $PROG enc -e -k "$HASH" -$alg -bufsize $bufsize \
+ -engine aesni <$PROG | \
$PROG enc -d -k "$HASH" -$alg | \
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
@@ -39,8 +38,7 @@ if $PROG engine aesni | grep -v no-aesni
fi
done
for bufsize in $BUFSIZE; do
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg | \
+ TEST=`( $PROG enc -e -k "$HASH" -$alg <$PROG | \
$PROG enc -d -k "$HASH" -$alg -bufsize $bufsize -engine aesni |
\
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
@@ -48,8 +46,7 @@ if $PROG engine aesni | grep -v no-aesni
nerr=`expr $nerr + 1`
fi
done
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg -engine aesni | \
+ TEST=`( $PROG enc -e -k "$HASH" -$alg -engine aesni <$PROG | \
$PROG enc -d -k "$HASH" -$alg -engine aesni | \
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
Index: lib/libssl/test/test_padlock
===================================================================
RCS file: /cvs/src/lib/libssl/test/test_padlock,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 test_padlock
--- lib/libssl/test/test_padlock 1 Oct 2010 22:54:17 -0000 1.1.1.1
+++ lib/libssl/test/test_padlock 10 Oct 2022 18:13:53 -0000
@@ -15,8 +15,7 @@ else
fi
if $PROG engine padlock | grep -v no-ACE; then
-
- HASH=`cat $PROG | $PROG dgst -hex`
+ HASH=`$PROG dgst -hex <$PROG`
ACE_ALGS=" aes-128-ecb aes-192-ecb aes-256-ecb \
aes-128-cbc aes-192-cbc aes-256-cbc \
@@ -27,24 +26,22 @@ if $PROG engine padlock | grep -v no-ACE
for alg in $ACE_ALGS; do
echo $alg
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg -bufsize 999 -engine padlock | \
+ TEST=`( $PROG enc -e -k "$HASH" -$alg -bufsize 999 \
+ -engine padlock <$PROG | \
$PROG enc -d -k "$HASH" -$alg | \
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
echo "-$alg encrypt test failed"
nerr=`expr $nerr + 1`
fi
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg | \
+ TEST=`( $PROG enc -e -k "$HASH" -$alg <$PROG | \
$PROG enc -d -k "$HASH" -$alg -bufsize 999 -engine padlock | \
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
echo "-$alg decrypt test failed"
nerr=`expr $nerr + 1`
fi
- TEST=`( cat $PROG | \
- $PROG enc -e -k "$HASH" -$alg -engine padlock | \
+ TEST=`( $PROG enc -e -k "$HASH" -$alg -engine padlock <$PROG | \
$PROG enc -d -k "$HASH" -$alg -engine padlock | \
$PROG dgst -hex ) 2>/dev/null`
if [ "$TEST" != "$HASH" ]; then
Index: regress/lib/libc/db/run.test
===================================================================
RCS file: /cvs/src/regress/lib/libc/db/run.test,v
retrieving revision 1.3
diff -u -p -r1.3 run.test
--- regress/lib/libc/db/run.test 29 Jan 2001 02:05:41 -0000 1.3
+++ regress/lib/libc/db/run.test 10 Oct 2022 18:13:53 -0000
@@ -223,7 +223,6 @@ test4()
exit
}' > $TMP1
rm -f $TMP2 $TMP3
- cat $TMP1 |
awk 'BEGIN {
i = 37;
incr = 17;
@@ -248,7 +247,7 @@ test4()
printf("g\nk%d\n", i);
for (i = 19234; i <= 19234 + 61 * 27; i += 27)
printf("g\nk%d\n", i);
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 recno $TMP2
if (cmp -s $TMP1 $TMP3) ; then :
else
@@ -273,7 +272,6 @@ test5()
exit;
}' > $TMP1
rm -f $TMP2 $TMP3
- cat $TMP1 |
awk 'BEGIN {
i = 1500;
}
@@ -284,7 +282,7 @@ test5()
END {
for (i = 1500; i; --i)
printf("g\nk%d\n", i);
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 recno $TMP2
if (cmp -s $TMP1 $TMP3) ; then :
else
@@ -316,7 +314,6 @@ test6()
exit;
}' > $TMP1
rm -f $TMP2 $TMP3
- cat $TMP1 |
awk 'BEGIN {
i = 1;
even = 0;
@@ -334,7 +331,7 @@ test6()
END {
for (i = 1; i < 1200; ++i)
printf("g\nk%d\n", i);
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 recno $TMP2
sort -o $TMP1 $TMP1
sort -o $TMP3 $TMP3
@@ -362,7 +359,6 @@ test7()
rm -f $TMP2 $TMP3
for type in btree recno; do
- cat $TMP1 |
awk '{
if (i == 120)
exit;
@@ -378,7 +374,7 @@ test7()
printf("fR_CURSOR\ns\nk1\n");
printf("r\n");
printf("fR_FIRST\ns\n");
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 recno $TMP2
if (cmp -s $TMP1 $TMP3) ; then :
else
@@ -425,7 +421,6 @@ test9()
rm -f $TMP2 $TMP3
for type in btree; do
- cat $TMP1 |
awk '{
if (i++ % 2)
printf("p\nkduplicatekey\nd%s\n", $0);
@@ -434,7 +429,7 @@ test9()
}
END {
printf("o\n");
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -iflags=1 -o $TMP3 $type $TMP2
sort -o $TMP3 $TMP3
if (cmp -s $TMP1 $TMP3) ; then :
@@ -459,7 +454,6 @@ test10()
# Test that R_CURSOR doesn't succeed before cursor initialized
for type in btree recno; do
- cat $TMP1 |
awk '{
if (i == 10)
exit;
@@ -468,7 +462,7 @@ test10()
END {
printf("fR_CURSOR\nr\n");
printf("eR_CURSOR SHOULD HAVE FAILED\n");
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
if [ -s $TMP3 ] ; then
echo "Test 10: delete: R_CURSOR SHOULD HAVE FAILED"
@@ -476,7 +470,6 @@ test10()
fi
done
for type in btree recno; do
- cat $TMP1 |
awk '{
if (i == 10)
exit;
@@ -485,7 +478,7 @@ test10()
END {
printf("fR_CURSOR\np\nk1\ndsome data\n");
printf("eR_CURSOR SHOULD HAVE FAILED\n");
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
if [ -s $TMP3 ] ; then
echo "Test 10: put: R_CURSOR SHOULD HAVE FAILED"
@@ -507,7 +500,6 @@ test11()
rm -f $TMP2 $TMP3
for type in recno; do
- cat $TMP1 |
awk '{
if (i == 0) {
i = 1;
@@ -518,7 +510,7 @@ test11()
}
END {
printf("or\n");
- }' > $TMP2
+ }' < $TMP1 > $TMP2
$PROG -o $TMP3 $type $TMP2
if (cmp -s $TMP1 $TMP3) ; then :
else
Index: regress/sbin/ipsecctl/Makefile
===================================================================
RCS file: /cvs/src/regress/sbin/ipsecctl/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- regress/sbin/ipsecctl/Makefile 14 Apr 2017 18:14:33 -0000 1.62
+++ regress/sbin/ipsecctl/Makefile 10 Oct 2022 18:13:54 -0000
@@ -36,7 +36,7 @@ IPSECCTL?= /sbin/ipsecctl
IPSEC_TARGETS+=ipsec${n}
ipsec${n}:
- cat ${.CURDIR}/ipsec${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/ipsec${n}.in | \
${IPSECCTL} -nv -f - | diff -u ${.CURDIR}/ipsec${n}.ok /dev/stdin
.endfor
@@ -44,7 +44,7 @@ ipsec${n}:
TCPMD5_TARGETS+=tcpmd5${n}
tcpmd5${n}:
- cat ${.CURDIR}/tcpmd5${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/tcpmd5${n}.in | \
${IPSECCTL} -nkv -f - | diff -u ${.CURDIR}/tcpmd5${n}.ok /dev/stdin
.endfor
@@ -52,7 +52,7 @@ tcpmd5${n}:
SA_TARGETS+=sa${n}
sa${n}:
- cat ${.CURDIR}/sa${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/sa${n}.in | \
${IPSECCTL} -knv -f - | diff -u ${.CURDIR}/sa${n}.ok /dev/stdin
.endfor
@@ -60,7 +60,7 @@ sa${n}:
SAFAIL_TARGETS+=safail${n}
safail${n}:
- cat ${.CURDIR}/safail${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/safail${n}.in | \
${IPSECCTL} -nv -f - 2>&1 | diff -u ${.CURDIR}/safail${n}.ok
/dev/stdin
.endfor
@@ -68,7 +68,7 @@ safail${n}:
IPSECFAIL_TARGETS+=ipsecfail${n}
ipsecfail${n}:
- cat ${.CURDIR}/ipsecfail${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/ipsecfail${n}.in | \
${IPSECCTL} -nv -f - 2>&1 | diff -u ${.CURDIR}/ipsecfail${n}.ok
/dev/stdin
.endfor
@@ -76,7 +76,7 @@ ipsecfail${n}:
IKE_TARGETS+=ike${n}
ike${n}:
- cat ${.CURDIR}/ike${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/ike${n}.in | \
${IPSECCTL} -nv -f - | diff -u ${.CURDIR}/ike${n}.ok /dev/stdin
.endfor
@@ -84,7 +84,7 @@ ike${n}:
IKEFAIL_TARGETS+=ikefail${n}
ikefail${n}:
- cat ${.CURDIR}/ikefail${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/ikefail${n}.in | \
${IPSECCTL} -nv -f - 2>&1 | diff -u ${.CURDIR}/ikefail${n}.ok
/dev/stdin
.endfor
@@ -92,7 +92,7 @@ ikefail${n}:
IKEDEL_TARGETS+=ikedel${n}
ikedel${n}:
- cat ${.CURDIR}/ikedel${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+ sed 's,DIR,${.CURDIR},g' ${.CURDIR}/ikedel${n}.in | \
${IPSECCTL} -dnv -f - | diff -u ${.CURDIR}/ikedel${n}.ok /dev/stdin
.endfor
Index: regress/sbin/isakmpd/exchange/run.sh
===================================================================
RCS file: /cvs/src/regress/sbin/isakmpd/exchange/run.sh,v
retrieving revision 1.1
diff -u -p -r1.1 run.sh
--- regress/sbin/isakmpd/exchange/run.sh 8 Apr 2005 17:12:49 -0000
1.1
+++ regress/sbin/isakmpd/exchange/run.sh 10 Oct 2022 18:13:54 -0000
@@ -118,7 +118,7 @@ while [ \( $his_turn = yes -a X"$in_pack
packet=$1
shift
out_packets=$*
- cat $packet |${NC} -nu -w${TIMEOUT} -p${SRCPORT} 127.0.0.1 ${DSTPORT} \
+ ${NC} -nu -w${TIMEOUT} -p${SRCPORT} 127.0.0.1 ${DSTPORT} <$packet \
>packet
my_turn=no
else
Index: regress/usr.bin/cvs/Makefile
===================================================================
RCS file: /cvs/src/regress/usr.bin/cvs/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- regress/usr.bin/cvs/Makefile 7 Jul 2017 23:55:21 -0000 1.32
+++ regress/usr.bin/cvs/Makefile 10 Oct 2022 18:13:54 -0000
@@ -206,13 +206,13 @@ test-cvs-commit-Fflag:
-F ${REGRESS_WCOPY}/logmsg.txt > /dev/null
@grep "^@commit seed repo" \
${REGRESS_ROOT}/seed/seed1.txt,v > /dev/null
- @eval 'test `cat ${REGRESS_ROOT}/seed/seed1.txt,v | wc -l` -eq 60'
+ @eval 'test `wc -l < ${REGRESS_ROOT}/seed/seed1.txt,v` -eq 60'
@test -f ${REGRESS_ROOT}/seed/seed2.txt,v
test-cvs-commit-to_branch:
@sleep 1
@cd ${REGRESS_SEED}; ${CVSCMD} commit -m'first branch seed' > /dev/null
- @eval 'test `cat ${REGRESS_ROOT}/seed/seed1.txt,v | wc -l` -eq 80'
+ @eval 'test `wc -l < ${REGRESS_ROOT}/seed/seed1.txt,v` -eq 80'
@eval 'test `grep -c TFIRST_BRANCH ${REGRESS_SEED}/CVS/Entries` -eq 2'
test-cvs-diff:
Index: regress/usr.bin/ftp/dasho.sh
===================================================================
RCS file: /cvs/src/regress/usr.bin/ftp/dasho.sh,v
retrieving revision 1.3
diff -u -p -r1.3 dasho.sh
--- regress/usr.bin/ftp/dasho.sh 8 Jul 2018 17:36:47 -0000 1.3
+++ regress/usr.bin/ftp/dasho.sh 10 Oct 2022 18:13:54 -0000
@@ -39,7 +39,7 @@ for a in exitcode stdout stderr files; d
echo "expected:"
eval "print -r -- \"\$$a\"" | sed 's/^/> /'
echo "got:"
- cat ../$a | sed 's/^/> /'
+ sed 's/^/> /' ../$a
echo
result=1
fi
Index: regress/usr.bin/make/Makefile
===================================================================
RCS file: /cvs/src/regress/usr.bin/make/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- regress/usr.bin/make/Makefile 2 Sep 2021 07:14:15 -0000 1.51
+++ regress/usr.bin/make/Makefile 10 Oct 2022 18:13:54 -0000
@@ -14,16 +14,16 @@ t1: t1.out
# This is a POSIX test. pmake does not pass variables to submakes until
# after OpenBSD 2.7.
t2:
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk2| diff - t2.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk2 | diff - t2.out
t3:
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk3 -f mk3a|diff -
t3.out
- cd ${.CURDIR} && cat mk3a |env -i PATH=${PATH} ${MAKE} -r -f mk3 -f
-|diff - t3.out
- cd ${.CURDIR} && cat mk3 |env -i PATH=${PATH} ${MAKE} -r -f - -f
mk3a|diff - t3.out
- cd ${.CURDIR} && cat mk3 mk3a|env -i PATH=${PATH} ${MAKE} -r -f - |diff
- t3.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk3 -f mk3a | diff -
t3.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk3 -f - <mk3a |
diff - t3.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f - -f mk3a <mk3 |
diff - t3.out
+ cd ${.CURDIR} && cat mk3 mk3a | env -i PATH=${PATH} ${MAKE} -r -f - |
diff - t3.out
t4:
- cd ${.CURDIR} && cat mk4 mk4a|env -i PATH=${PATH} ${MAKE} -r -f - |diff
- t4.out
+ cd ${.CURDIR} && cat mk4 mk4a | env -i PATH=${PATH} ${MAKE} -r -f - |
diff - t4.out
# Splitting files along conditionals should not work
if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk4 -f mk4a
2>/dev/null || test $$? -ge 128 ; then false; fi
@@ -53,20 +53,20 @@ t9:
# verify that systemV extended variables work as expected
t10: z.a
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk10 |diff - t10.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk10 | diff - t10.out
# check for substitution parser in some confusing situations
t11:
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 |diff - t11.out
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 A=t|diff -
t11.out2
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 | diff - t11.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 A=t | diff -
t11.out2
# Check for filename expansions.
t12:
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk12 |diff - t12.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk12 | diff - t12.out
# Verify whitespace handling.
t13:
- cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk13 |diff - t13.out
+ cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk13 | diff - t13.out
# make currently incorrectly uses annotations for suffixes rules
# for non-suffixes rules.
@@ -103,7 +103,7 @@ t22:
cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk22 b | diff -
t22.out
t23:
- cd ${.CURDIR} && ulimit -t 60 && env -i PATH=${PATH} ${MAKE} -r -f mk22
a 2>&1| diff - t23.out
+ cd ${.CURDIR} && ulimit -t 60 && env -i PATH=${PATH} ${MAKE} -r -f mk22
a 2>&1 | diff - t23.out
t24:
if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk23 a
2>/dev/null || test $$? -ge 128; then false; fi
@@ -150,7 +150,7 @@ t35:
cd ${.CURDIR} && env -i PATH=${PATH} B=2 ${MAKE} -r -f mk32 all | diff
- t35.out
t36:
- if echo '$$$$(A:&)' | env -i PATH=${PATH} ${MAKE} -r -f - 2>/dev/null||
test $$? -ge 128; then false; fi
+ if echo '$$$$(A:&)' | env -i PATH=${PATH} ${MAKE} -r -f - 2>/dev/null
|| test $$? -ge 128; then false; fi
z.a:
touch $@
Index: regress/usr.bin/signify/signify.sh
===================================================================
RCS file: /cvs/src/regress/usr.bin/signify/signify.sh,v
retrieving revision 1.10
diff -u -p -r1.10 signify.sh
--- regress/usr.bin/signify/signify.sh 3 Apr 2020 12:01:56 -0000 1.10
+++ regress/usr.bin/signify/signify.sh 10 Oct 2022 18:13:54 -0000
@@ -11,7 +11,7 @@ forgery="$srcdir/forgery.txt"
set -e
-cat $seckey | signify -S -s - -x test.sig -m $orders
+signify -S -s - -x test.sig -m $orders < $seckey
diff -u "$orders.sig" test.sig
signify -V -q -p $pubkey -m $orders
Index: regress/usr.bin/sort/stests
===================================================================
RCS file: /cvs/src/regress/usr.bin/sort/stests,v
retrieving revision 1.18
diff -u -p -r1.18 stests
--- regress/usr.bin/sort/stests 31 May 2018 15:40:24 -0000 1.18
+++ regress/usr.bin/sort/stests 10 Oct 2022 18:13:54 -0000
@@ -950,14 +950,14 @@ xsort "A"
# generate already sorted file using $dict, only append space and
# long string to each line to make lines longer than usual
# use only first 200 lines (sort file approx. 14MB)
-cat $dict | awk '
+awk '
BEGIN {
line = "'"$line1"'"
for(i=0; i<10; i++)
line = line line
idx = 0
}
-{ print $1 " " line; if (idx++ > 200) exit 0 }' > in
+{ print $1 " " line; if (idx++ > 200) exit 0 }' < $dict > in
ln -sf in out
xsort "B" -f
rm -f in out
Index: regress/usr.bin/ssh/cert-file.sh
===================================================================
RCS file: /cvs/src/regress/usr.bin/ssh/cert-file.sh,v
retrieving revision 1.8
diff -u -p -r1.8 cert-file.sh
--- regress/usr.bin/ssh/cert-file.sh 26 Nov 2019 23:43:10 -0000 1.8
+++ regress/usr.bin/ssh/cert-file.sh 10 Oct 2022 18:13:54 -0000
@@ -49,7 +49,7 @@ opts2="$opts -i $OBJ/user_key1 -i $OBJ/u
echo "cert-authority $(cat $OBJ/user_ca_key1.pub)" > $OBJ/authorized_keys_$USER
# Make a clean config that doesn't have any pre-added identities.
-cat $OBJ/ssh_proxy | grep -v IdentityFile > $OBJ/no_identity_config
+grep -v IdentityFile $OBJ/ssh_proxy > $OBJ/no_identity_config
# XXX: verify that certificate used was what we expect. Needs exposure of
# keys via environment variable or similar.
Index: regress/usr.bin/ssh/principals-command.sh
===================================================================
RCS file: /cvs/src/regress/usr.bin/ssh/principals-command.sh,v
retrieving revision 1.14
diff -u -p -r1.14 principals-command.sh
--- regress/usr.bin/ssh/principals-command.sh 30 Sep 2021 05:26:26 -0000
1.14
+++ regress/usr.bin/ssh/principals-command.sh 10 Oct 2022 18:13:54 -0000
@@ -26,8 +26,8 @@ ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I "
-z $$ -n ${USER},mekmitasdigoat $OBJ/cert_user_key || \
fatal "couldn't sign cert_user_key"
-CERT_BODY=`cat $OBJ/cert_user_key-cert.pub | awk '{ print $2 }'`
-CA_BODY=`cat $OBJ/user_ca_key.pub | awk '{ print $2 }'`
+CERT_BODY=`awk '{ print $2 }' < $OBJ/cert_user_key-cert.pub`
+CA_BODY=`awk '{ print $2 }' < $OBJ/user_ca_key.pub`
CERT_FP=`${SSHKEYGEN} -lf $OBJ/cert_user_key-cert.pub | awk '{ print $2 }'`
CA_FP=`${SSHKEYGEN} -lf $OBJ/user_ca_key.pub | awk '{ print $2 }'`
Index: regress/usr.bin/ssh/ssh-com-client.sh
===================================================================
RCS file: /cvs/src/regress/usr.bin/ssh/ssh-com-client.sh,v
retrieving revision 1.7
diff -u -p -r1.7 ssh-com-client.sh
--- regress/usr.bin/ssh/ssh-com-client.sh 17 May 2013 04:29:14 -0000
1.7
+++ regress/usr.bin/ssh/ssh-com-client.sh 10 Oct 2022 18:13:54 -0000
@@ -104,8 +104,7 @@ for v in ${VERSIONS}; do
# data transfer, again
if [ $skipcat -eq 0 ]; then
rm -f ${COPY}
- cat ${DATA} | \
- ${ssh2} -F ${OBJ}/ssh2_config host "cat > ${COPY}"
+ ${ssh2} -F ${OBJ}/ssh2_config host "cat > ${COPY}" < ${DATA}
if [ $? -ne 0 ]; then
fail "ssh2 ${v} cat test (send) failed"
fi
Index: regress/usr.sbin/btrace/Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/btrace/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- regress/usr.sbin/btrace/Makefile 19 Dec 2021 01:07:50 -0000 1.25
+++ regress/usr.sbin/btrace/Makefile 10 Oct 2022 18:13:54 -0000
@@ -27,7 +27,7 @@ run-$b:
.for b in ${BT_ARG_LANG_SCRIPTS}
REGRESS_TARGETS+= run-$b
run-$b:
- cat ${.CURDIR}/$b.args | xargs ${BTRACE} ${.CURDIR}/$b.bt 2>&1 | \
+ xargs ${BTRACE} ${.CURDIR}/$b.bt <${.CURDIR}/$b.args 2>&1 | \
diff -u ${.CURDIR}/$b.ok /dev/stdin
.endfor
Index: regress/usr.sbin/httpd/patterns/Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/httpd/patterns/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- regress/usr.sbin/httpd/patterns/Makefile 23 Jun 2015 19:33:06 -0000
1.2
+++ regress/usr.sbin/httpd/patterns/Makefile 10 Oct 2022 18:13:54 -0000
@@ -17,16 +17,16 @@ patterns-tester: patterns-tester.c patte
${CC} -o $@ ${CFLAGS} ${.CURDIR}/patterns-tester.c
${HTTPDSRC}/patterns.c -I${HTTPDSRC}
test-patterns: patterns-tester test-patterns.out test-patterns.in
- cat ${.CURDIR}/test-patterns.in | grep -v '^#' |
\
+ grep -v '^#' ${.CURDIR}/test-patterns.in |
\
while IFS=' ' read string pattern comments ; do
\
./patterns-tester "$${string}" "$${pattern}" 2>&1 || true;
\
done | diff -I 'OpenBSD' -u ${.CURDIR}/test-patterns.out -
test-patterns-lua: patterns-tester.lua test-patterns-lua.out test-patterns.in
- cat ${.CURDIR}/test-patterns.in | grep -v '^#' |
\
- while IFS=' ' read string pattern comments ; do
\
+ grep -v '^#' ${.CURDIR}/test-patterns.in |
\
+ while IFS=' ' read string pattern comments ; do
\
${LUA} ${.CURDIR}/patterns-tester.lua "$${string}"
"$${pattern}" 2>&1 || true; \
- done | sed "s/.*\/patterns\-tester\.lua/X_PATTERNS_TESTER_X/g" | \
+ done | sed "s/.*\/patterns\-tester\.lua/X_PATTERNS_TESTER_X/g" |
\
diff -I 'OpenBSD' -u ${.CURDIR}/test-patterns-lua.out -
.include <bsd.regress.mk>
Index: sbin/disklabel/Makefile
===================================================================
RCS file: /cvs/src/sbin/disklabel/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- sbin/disklabel/Makefile 20 Sep 2021 20:23:44 -0000 1.70
+++ sbin/disklabel/Makefile 10 Oct 2022 18:13:54 -0000
@@ -21,7 +21,7 @@ disklabel.cat8: disklabel.8
manual.c: disklabel.cat8
(echo 'const unsigned char manpage[] = {'; \
- cat disklabel.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
+ gzip -9c < disklabel.cat8 | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.endif
Index: sbin/fdisk/Makefile
===================================================================
RCS file: /cvs/src/sbin/fdisk/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- sbin/fdisk/Makefile 23 May 2022 16:58:11 -0000 1.46
+++ sbin/fdisk/Makefile 10 Oct 2022 18:13:54 -0000
@@ -34,7 +34,7 @@ fdisk.cat8: fdisk.8
manual.c: fdisk.cat8
(echo 'const unsigned char manpage[] = {'; \
- cat fdisk.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
+ gzip -9c < fdisk.cat8 | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
.endif
Index: sys/arch/arm64/conf/Makefile.arm64
===================================================================
RCS file: /cvs/src/sys/arch/arm64/conf/Makefile.arm64,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile.arm64
--- sys/arch/arm64/conf/Makefile.arm64 14 Jan 2022 06:53:16 -0000 1.42
+++ sys/arch/arm64/conf/Makefile.arm64 10 Oct 2022 18:13:55 -0000
@@ -139,9 +139,10 @@ ioconf.o: ioconf.c
${NORMAL_C}
ld.script: ${_archdir}/conf/kern.ldscript
- cat ${_archdir}/conf/kern.ldscript | \
- sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
- -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ld.script
+ sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+ -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
+ ${_archdir}/conf/kern.ldscript > ld.script
+
gapdummy.o:
echo '__asm(".section .rodata,\"a\"");' > gapdummy.c
${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
Index: sys/arch/armv7/conf/Makefile.armv7
===================================================================
RCS file: /cvs/src/sys/arch/armv7/conf/Makefile.armv7,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile.armv7
--- sys/arch/armv7/conf/Makefile.armv7 17 Dec 2021 14:59:22 -0000 1.52
+++ sys/arch/armv7/conf/Makefile.armv7 10 Oct 2022 18:13:55 -0000
@@ -114,10 +114,10 @@ ioconf.o: ioconf.c
${NORMAL_C}
ld.script: ${_archdir}/conf/kern.ldscript
- cat ${_archdir}/conf/kern.ldscript | \
- sed -e 's/@KERNEL_BASE_PHYS@/0/' \
+ sed -e 's/@KERNEL_BASE_PHYS@/0/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
- -e 's/(KERNEL_BASE_phys)/(KERNEL_BASE_virt)/' > ld.script
+ -e 's/(KERNEL_BASE_phys)/(KERNEL_BASE_virt)/' \
+ ${_archdir}/conf/kern.ldscript > ld.script
gapdummy.o:
echo '__asm(".section .rodata,\"a\"");' > gapdummy.c
Index: sys/arch/riscv64/conf/Makefile.riscv64
===================================================================
RCS file: /cvs/src/sys/arch/riscv64/conf/Makefile.riscv64,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.riscv64
--- sys/arch/riscv64/conf/Makefile.riscv64 12 Jan 2022 00:58:48 -0000
1.15
+++ sys/arch/riscv64/conf/Makefile.riscv64 10 Oct 2022 18:13:55 -0000
@@ -117,9 +117,10 @@ ioconf.o: ioconf.c
${NORMAL_C}
ld.script: ${_archdir}/conf/kern.ldscript
- cat ${_archdir}/conf/kern.ldscript | \
- sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
- -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ld.script
+ sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+ -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
+ ${_archdir}/conf/kern.ldscript > ld.script
+
gapdummy.o:
echo '__asm(".section .rodata,\"a\"");' > gapdummy.c
${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
