diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2019-09-28 17:30:07 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2019-09-28 17:30:07 +0000 |
| commit | 1a49fa34ae3de435d3bc8be7cc75d47be4a71074 (patch) | |
| tree | 39c00d3b5cbf69982233848a177eda6bf31c5aa0 /usr.bin/diff3 | |
| parent | It is better style if path[] buffers are PATH_MAX, rather than (diff) | |
| download | wireguard-openbsd-1a49fa34ae3de435d3bc8be7cc75d47be4a71074.tar.xz wireguard-openbsd-1a49fa34ae3de435d3bc8be7cc75d47be4a71074.zip | |
Add where missing and harmonize PATH to be _PATH_DEFPATH (without local nor
X11R6).
Suggested by tb@
ok deraadt@ tb@ millert@
Diffstat (limited to 'usr.bin/diff3')
| -rw-r--r-- | usr.bin/diff3/diff3.ksh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff3/diff3.ksh b/usr.bin/diff3/diff3.ksh index bf96b32d776..48bd8ae57bd 100644 --- a/usr.bin/diff3/diff3.ksh +++ b/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" |