Add where missing and harmonize PATH to be _PATH_DEFPATH (without local nor

X11R6).
Suggested by tb@

ok deraadt@ tb@ millert@

libexec/reorder_kernel/reorder_kernel.sh

@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: reorder_kernel.sh,v 1.8 2019/07/30 13:44:00 deraadt Exp $
+# $OpenBSD: reorder_kernel.sh,v 1.9 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 2017 Robert Peichaer <rpe@openbsd.org>
 #
@@ -18,7 +18,7 @@
 
 set -o errexit
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 # Skip if /usr/share is on a nfs mounted filesystem.
 df -t nfs /usr/share >/dev/null 2>&1 && exit 1

usr.bin/cpp/cpp.sh

@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: cpp.sh,v 1.9 2013/12/09 02:35:09 guenther Exp $
+#	$OpenBSD: cpp.sh,v 1.10 2019/09/28 17:30:07 ajacoutot Exp $
 
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #	specifies -traditional
 #	doesn't search gcc-include
 #
-PATH=/usr/bin:/bin
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
 TRAD=-traditional
 DGNUC="@GNUC@"
 STDINC="-I/usr/include"

usr.bin/diff3/diff3.ksh

@@ -1,6 +1,6 @@
 #!/bin/ksh -
 #
-# $OpenBSD: diff3.ksh,v 1.5 2019/01/25 00:19:26 millert Exp $
+# $OpenBSD: diff3.ksh,v 1.6 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 2003 Todd C. Miller <millert@openbsd.org>
 #
@@ -24,7 +24,7 @@
 set -o posix		# set POSIX mode to prevent +foo in getopts
 OPTIND=1		# force getopts to reset itself
 
-export PATH=/bin:/usr/bin
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 diff3prog=/usr/libexec/diff3prog
 USAGE="usage: diff3 [-3aEeXx] file1 file2 file3"
 

usr.sbin/adduser/rmgroup.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: rmgroup.sh,v 1.2 1998/07/16 16:47:41 millert Exp $
+# $OpenBSD: rmgroup.sh,v 1.3 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -8,7 +8,7 @@
 #
 # $From: rmgroup.sh,v 1.1 1996/10/30 20:58:47 wosch Exp $
 
-PATH=/bin:/usr/bin; export PATH
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 db=/etc/group
 
 case "$1" in

usr.sbin/sysmerge/sysmerge.sh

@@ -1,6 +1,6 @@
 #!/bin/ksh -
 #
-# $OpenBSD: sysmerge.sh,v 1.234 2019/09/08 13:30:46 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.235 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -19,6 +19,7 @@
 #
 
 umask 0022
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 usage() {
 	echo "usage: ${0##*/} [-bdp]" >&2 && exit 1

usr.sbin/syspatch/syspatch.sh

@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: syspatch.sh,v 1.149 2019/07/07 11:11:22 ajacoutot Exp $
+# $OpenBSD: syspatch.sh,v 1.150 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org>
 #
@@ -18,6 +18,7 @@
 
 set -e
 umask 0022
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 sp_err()
 {

usr.sbin/sysupgrade/sysupgrade.sh

@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: sysupgrade.sh,v 1.24 2019/09/25 14:42:52 florian Exp $
+# $OpenBSD: sysupgrade.sh,v 1.25 2019/09/28 17:30:07 ajacoutot Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015 Robert Peichaer <rpe@openbsd.org>
@@ -22,6 +22,7 @@
 
 set -e
 umask 0022
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 ARCH=$(uname -m)
 SETSDIR=/home/_sysupgrade