freebsd-dev/usr.bin
Kyle Evans 67c907653e diff(1): don't reject specifying the same format multiple times
This may happen, for instance, if one happens to have an alias of diff to
diff -up and attempts to specify the amount of context on top of that.

Aliases like this may cause other problems, but if they're really not ever
generating non-unified diffs then we should at least not break that
use-case.

In addition, we'll now pick up a format mismatch if -p is specified with
!contextual && !unified && !unset.

Fix up a small trailing whitespace nit in the tests while we're here, and
add tests to make sure that we can double up all the formatting options.

Reported by:	jbeich
MFC after:	3 days
2020-04-28 14:33:33 +00:00
..
addr2line
alias
apply
ar ar: use more correct size_t type for loop index 2019-09-01 16:51:25 +00:00
asa
at
atm
awk Fix .depend files to work for build tools. 2019-06-15 17:08:13 +00:00
banner
basename
bc Sync with OpenBSD. 2019-01-12 12:35:02 +00:00
biff
bluetooth pkgbase: Add a FreeBSD-bluetooth package 2019-07-19 15:10:03 +00:00
bmake Merge bmake-20181221 2018-12-23 01:05:52 +00:00
brandelf Update Makefile.depend files 2019-12-11 17:37:53 +00:00
bsdcat MFV r357783: 2020-02-12 00:16:56 +00:00
bsdiff bspatch: add integer overflow checks 2019-09-26 13:27:25 +00:00
bzip2 Install all bzip2.1 MLINKs from the same place. 2019-08-28 21:01:51 +00:00
bzip2recover Install all bzip2.1 MLINKs from the same place. 2019-08-28 21:01:51 +00:00
c89
c99
caesar
calendar Tidy up syntax and punctuation of some entries. 2020-04-17 23:14:51 +00:00
cap_mkdb
chat
chkey Update Makefile.depend files 2019-12-11 17:37:53 +00:00
chpass Update Makefile.depend files 2019-12-11 17:37:53 +00:00
cksum
clang lldb: build and enable lua script bindings 2020-04-03 16:54:13 +00:00
cmp Drop "All rights reserved" from the files I own 2019-03-11 22:23:56 +00:00
col
colrm
column
comm
compile_et
compress Fix descriptor/memory leak in compress(1) code 2019-01-18 00:26:25 +00:00
cpio MFV r357783: 2020-02-12 00:16:56 +00:00
cpuset Fix an off-by-one bug in the CPU and domain ID parser. 2019-09-01 21:20:31 +00:00
csplit
ctags
ctlstat Flush stdout after each iteration. 2019-03-06 15:19:04 +00:00
cut
cxxfilt
dc Adjust history, info source from v1's manuals 2019-09-04 13:44:46 +00:00
diff diff(1): don't reject specifying the same format multiple times 2020-04-28 14:33:33 +00:00
diff3 Replace homemade getline(3) by actual getline(3) 2019-12-17 11:03:32 +00:00
dirname
dpv pkgbase: Add a FreeBSD-dpv package 2019-07-19 15:10:53 +00:00
drill
dtc dtc: remove unknown option printf, since getopt will print it 2020-02-20 21:29:59 +00:00
du pkgbase: Put a lot of binaries and lib in FreeBSD-runtime 2019-09-05 14:13:08 +00:00
ee
elfctl elfctl: remove memory leak 2020-03-11 13:51:01 +00:00
elfdump elfdump: use designated array initialization for note types 2019-01-31 16:49:06 +00:00
enigma
env Fix invalid use of macros and two typos 2020-04-24 22:02:22 +00:00
etdump
expand
factor Fix the way 'factor' behaves when using OpenSSL to match the description 2020-01-12 20:25:11 +00:00
false
fetch
file
file2c
find Use the Ic macro for find(1) primaries consistently 2020-04-18 13:29:54 +00:00
finger
fmt
fold
fortune A few corrections and clarifications to r343406. 2019-01-28 19:54:58 +00:00
from
fstat Grammar fix. 2019-10-28 21:48:20 +00:00
fsync pkgbase: Put a lot of binaries and lib in FreeBSD-runtime 2019-09-05 14:13:08 +00:00
ftp
gcore gcore: Avoid using vm_map_entry_t. 2019-12-07 20:01:55 +00:00
gencat
getaddrinfo
getconf Update the spelling of my name 2019-04-22 17:52:46 +00:00
getent
getopt
gprof mail/gprof/tip: tap with the ugly stick 2020-04-06 23:28:24 +00:00
grdc Remove remnant from the pre LIBADD era 2019-09-13 14:51:00 +00:00
grep Update Makefile.depend files 2019-12-11 17:37:53 +00:00
gzip Remove unneeded checks for prelen. 2020-03-14 05:57:22 +00:00
head Update Makefile.depend files 2019-12-11 17:37:53 +00:00
hesinfo
hexdump hexdump: tests: take into account byte order 2020-03-02 18:40:34 +00:00
host
iconv
id
ident
indent indent: fix the -fno-common build 2020-04-06 23:20:20 +00:00
ipcrm
ipcs ipcs(1): drop obsolete error checking 2019-02-07 14:29:45 +00:00
iscsictl Stop hardcoding WARNS in iscsictl(8). 2020-04-01 15:08:53 +00:00
join
jot jot.1: Explain default argument values more precisely 2019-09-21 15:01:11 +00:00
kdump kdump: decode shm_open2 2020-02-19 14:55:59 +00:00
keylogin
keylogout
killall Revert r352953: Convert pnmatch to single element array in regexec calls 2019-10-02 16:08:01 +00:00
ktrace Make it clear what the userland traces are in the ktrace(1) man page. 2019-08-26 10:18:19 +00:00
ktrdump capsicum: use a new capsicum helpers in tools 2018-11-04 19:24:49 +00:00
kyua Install a kyua.conf based on the one in devel/kyua. 2020-04-03 15:47:15 +00:00
lam The lam(1) man page is unclear about the uppercase versions of the flags 2019-01-04 02:48:43 +00:00
last last(1): fix style after r351459 2019-08-25 01:05:01 +00:00
lastcomm
ldd ldd: add aout deprecation notice 2020-03-17 16:42:25 +00:00
ldd32 libcompat: Correct rtld MLINKS 2019-11-12 22:31:59 +00:00
leave Add extremely useful calendar(1) application to FreeBSD 2020-03-03 00:20:08 +00:00
less MFV r349535: less v551. 2019-06-29 18:41:40 +00:00
lessecho
lesskey
lex Disable new clang 10.0.0 warnings about misleading indentation in flex. 2020-01-31 19:02:53 +00:00
limits
locale locale: initialize variables to make gcc happy 2019-09-11 16:00:03 +00:00
localedef localedef: define characters in "space" class also as "print", except 2018-10-27 23:31:42 +00:00
locate locate: fix -fno-common build 2020-03-29 19:16:14 +00:00
lock
lockf lockf(1): return EX_UNAVAILABLE if -n is used and the lock file does not 2019-03-20 07:40:38 +00:00
logger logger: temporarily disable Capsicum when a host is provided 2020-04-08 18:43:00 +00:00
login Normalize deployment tools usage and definitions by putting into one place 2020-04-07 02:46:22 +00:00
logins
logname
look
lorder
lsvfs
lzmainfo
m4 m4: import from OpenBSD 2019-09-09 15:37:40 +00:00
mail mail/gprof/tip: tap with the ugly stick 2020-04-06 23:28:24 +00:00
man Teach man(1) about C.UTF-8. 2018-11-04 16:58:55 +00:00
mandoc Suppress old gcc warning about null format string 2019-04-12 18:35:14 +00:00
mesg
minigzip Move contrib/zlib to sys/contrib/zlib so that we can use it in kernel. 2019-05-08 08:43:15 +00:00
ministat Minor cleanups to allow handing vast datasets. 2020-02-03 20:46:31 +00:00
mkcsmapper
mkcsmapper_static
mkdep
mkesdb
mkesdb_static
mkfifo
mkimg Allow bootstrapping mkimg on macOS/Linux 2020-01-16 14:14:55 +00:00
mkstr
mktemp
mkuzip geom_uzip(4), mkuzip(8): Add Zstd image mode 2019-08-13 23:32:56 +00:00
morse
msgs
mt Add IBM TS1160 density codes to libmt and the mt(1) man page. 2019-03-04 14:30:37 +00:00
nc Add -M option to nc(1), which makes it print the TCP connection 2019-12-14 10:53:52 +00:00
ncal Remove spurious transition from Julian to Gregorian for country 2020-03-29 04:18:27 +00:00
netstat Fix string format error missed in r359823. 2020-04-12 15:16:34 +00:00
newgrp
newkey newkey(8): fix 'tmpname' memory leak (always) and input file descriptor leak 2019-02-08 14:31:44 +00:00
nfsstat Update the man page to reflect that "-M" and "-N" are deprecated and ignored. 2019-12-31 22:25:06 +00:00
nice
nl
nm Update Makefile.depend files 2019-12-11 17:37:53 +00:00
nohup Cross-reference nohup(1) and daemon(8). 2018-11-09 13:47:06 +00:00
number
objcopy
ofed
opieinfo
opiekey
opiepasswd
pagesize
pamtest
passwd pkgbase: Put a lot of binaries and lib in FreeBSD-runtime 2019-09-05 14:13:08 +00:00
paste
patch patch(1): give /dev/null patches special treatment 2019-11-04 03:07:01 +00:00
pathchk
perror
pom pom: Fix fencepost bugs. 2018-11-20 00:06:53 +00:00
posixshmcontrol Document that posixshmcontrol first appeared in 12.1 2020-03-18 15:02:09 +00:00
pr Drop "All rights reserved" from the files I own 2019-03-11 22:23:56 +00:00
primes Fix the way 'factor' behaves when using OpenSSL to match the description 2020-01-12 20:25:11 +00:00
printenv
printf printf(1): Note that \c only works in %b strings 2019-07-29 20:43:07 +00:00
proccontrol Add stackgap control mode to proccontrol(1). 2019-09-03 18:58:48 +00:00
procstat Add procstat support for AT_ flags added in r359988. 2020-04-15 20:25:38 +00:00
protect
quota Add a workaround for servers which respond RPC_PROGNOTREGISTERED 2019-09-21 00:17:40 +00:00
random random(6): Re-add undocumented support for floating point denominators 2020-02-15 19:13:37 +00:00
rctl rctl: fix sysctl kern.racct.enable use after r341182 2019-04-03 20:37:14 +00:00
readelf Update Makefile.depend files 2019-12-11 17:37:53 +00:00
renice
resizewin
rev
revoke
rpcgen rpcgen: make compiler arglist allocation dynamic 2019-10-15 16:05:17 +00:00
rpcinfo
rs
rup
ruptime Remove extra spaces for the load average of machines that are down. 2020-04-04 12:07:36 +00:00
rusers
rwall
rwho capsicum: use a new capsicum helpers in tools 2018-11-04 19:24:49 +00:00
script
sdiff
sdiotool
sed sed: process \r, \n, and \t 2019-12-10 19:16:00 +00:00
seq seq(1): Require user-provided format strings to contain a conversion 2019-03-07 18:24:16 +00:00
setchannel
shar Shar files may be seen as binary by grep. 2019-01-31 23:21:18 +00:00
showmount [showmount] implement long options 2019-12-12 05:11:53 +00:00
size Update Makefile.depend files 2019-12-11 17:37:53 +00:00
smbutil
sockstat sockstat: Attach to jail if in new vnet 2020-04-26 20:55:11 +00:00
soelim
sort Update Makefile.depend files 2019-12-11 17:37:53 +00:00
split Revert r352953: Convert pnmatch to single element array in regexec calls 2019-10-02 16:08:01 +00:00
ssh-copy-id
stat Unbreak the tests after r347002. 2019-05-01 19:35:45 +00:00
stdbuf
strings Update Makefile.depend files 2019-12-11 17:37:53 +00:00
su Do not use macros in -width 2020-03-26 17:58:52 +00:00
svn svn: support building with WITH_PIE 2019-02-21 15:08:25 +00:00
systat systat: remove redundant definition of kd 2020-03-29 02:30:23 +00:00
tabs
tail Use -F instead of -f in tail(1) examples 2020-03-22 21:51:50 +00:00
talk Use a private definition of osockaddr rather then relying on type 2019-01-18 21:30:06 +00:00
tar MFV r357783: 2020-02-12 00:16:56 +00:00
tcopy
tee capsicum: use a new capsicum helpers in tools 2018-11-04 19:24:49 +00:00
telnet Update Makefile.depend files 2019-12-11 17:37:53 +00:00
tests
tftp Add support for the TFTP windowsize option described in RFC 7440. 2020-03-02 22:19:30 +00:00
time
timeout
tip mail/gprof/tip: tap with the ugly stick 2020-04-06 23:28:24 +00:00
top Fix up r359594: -m takes an argument. 2020-04-03 14:47:40 +00:00
touch
tput
tr
true
truncate
truss Merge ^/head r358131 through r358178. 2020-02-20 19:07:29 +00:00
tset
tsort
tty
ul
uname pkgbase: Put a lot of binaries and lib in FreeBSD-runtime 2019-09-05 14:13:08 +00:00
unexpand
unifdef Re-apply fixed r354847 2019-11-20 19:43:34 +00:00
uniq Support --all-repeats in uniq(1) for compatibility with gnu coreutils. 2019-12-15 18:05:18 +00:00
units Tell the world how to convert gigabytes to bytes with units(1) easily 2020-03-17 10:02:59 +00:00
unvis
unzip
usbhidaction
usbhidctl Include item position in report descriptor dump in usbhidctl(1). 2019-08-17 08:29:22 +00:00
users
uudecode
uuencode Make outfile constant. 2018-11-12 07:14:34 +00:00
vacation
vgrind Normalize deployment tools usage and definitions by putting into one place 2020-04-07 02:46:22 +00:00
vi Remove RELEASE_CRUNCH here 2019-07-19 20:04:31 +00:00
vis
vmstat Move type casts into a single place. No functional changes. 2019-12-29 12:24:41 +00:00
vtfontcvt vtfontcvt: simplify rshift_row 2019-08-23 16:03:23 +00:00
w Fix address annotation in xml output from w 2019-08-29 02:44:18 +00:00
wall
wc wc(1): document SIGINFO handling in the manual page. 2020-04-11 08:16:35 +00:00
what pkgbase: Put a lot of binaries and lib in FreeBSD-runtime 2019-09-05 14:13:08 +00:00
whereis whereis: remove gnu/libexec from source search paths 2020-02-19 14:40:53 +00:00
which
who
whois Update RFC references in the whois(1) man page. 2019-08-08 21:15:02 +00:00
write Remove extraneous setutxent() calls in write(1). 2019-01-23 20:02:17 +00:00
xargs xargs: Fix exit status expression when a child process fails to exec. 2020-04-03 14:03:58 +00:00
xinstall Allow boostrapping xinstall on Linux 2019-11-20 17:24:49 +00:00
xo Allow proper builds of libxo's CSV encoder: 2019-12-16 22:05:03 +00:00
xohtml Import libxo-1.4.0: 2020-01-25 21:16:45 +00:00
xolint
xopo
xstr
xz
xzdec
yacc
yes
ypcat
ypmatch
ypwhich
zstd Update to Zstandard 1.4.0 2019-04-19 02:54:13 +00:00
Makefile Import the kyua test framework. 2020-03-23 19:01:23 +00:00
Makefile.amd64
Makefile.arm
Makefile.i386
Makefile.inc
Makefile.powerpc