aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.c
Commit message (Collapse)AuthorAgeFilesLines
* diff(1): Implement -B/--ignore-blank-linesKyle Evans2018-08-191-5/+9
| | | | | | | | | | | | | | | | As noted by cem in r338035, coccinelle invokes diff(1) with the -B flag. This was not previously implemented here, so one was forced to create a link for GNU diff to /usr/local/bin/diff Implement the -B flag and add some primitive tests for it. It is implemented in the same fashion that -I is implemented; each chunk's lines are scanned, and if a non-blank line is encountered then the chunk will be output. Otherwise, it's skipped. MFC after: 2 weeks Notes: svn path=/head/; revision=338039
* Add -H as an alias for --speed-large-file to match GNU diff.John Baldwin2017-06-021-5/+5
| | | | | | | | | | | This is undocumented to match GNU diff where -H is also undocumented. Some existing software (such as kompare) uses this option by default. Reviewed by: emaste, rpokala Differential Revision: https://reviews.freebsd.org/D11022 Notes: svn path=/head/; revision=319489
* Implement a basic --changed-group-formatBaptiste Daroussin2017-04-201-0/+7
| | | | | | | | | | | | | etcupdate(8) requires that option, while GNU diff supports many more variation of that options, their behaviour beside the simple verion implemented here are quite inconsistent as such I do not plan to implement those. The only special keyword supported by this implementation are: %< and %> %= is not implemented as the documentation of GNU diff says: common lines, but it actually when tested print the changes from the first file Notes: svn path=/head/; revision=317194
* Clean up headers declarationBaptiste Daroussin2017-04-151-2/+0
| | | | Notes: svn path=/head/; revision=316959
* add a stub --speed-large-files for compatibility with GNU diffBaptiste Daroussin2017-04-081-0/+4
| | | | | | | | There is no intention to implement it, but lots of scripts/tools using diff(1) passes GNU diff option Notes: svn path=/head/; revision=316639
* Use strndup(3) instead of malloc + memcpyBaptiste Daroussin2017-03-221-3/+2
| | | | Notes: svn path=/head/; revision=315746
* Implement a stub --horizon-lines=NUM for compatibility with GNU diff3Baptiste Daroussin2017-03-121-0/+4
| | | | | | | | | | some options of GNU diff3 would call diff with --horizon-lines, rcs is depending on that. Reported by: antoine Notes: svn path=/head/; revision=315103
* Import diff from OpenBSD and remove GNU diffBaptiste Daroussin2017-03-111-0/+454
Some of the modifications from the previous summer of code has been integrated Modification for compatibility with GNU diff output has been added Main difference with OpenBSD: Implement multiple GNU diff options: * --ignore-file-name-case * --no-ignore-file-name-case * --normal * --tabsize * --strip-trailing-cr Make diff -p compatible with GNU diff Implement diff -l Make diff -r compatible with GNU diff Capsicumize diffing 2 regular files Add a simple test suite Approved by: AsiaBSDcon devsummit Obtained from: OpenBSD, GSoC Relnotes: yes Notes: svn path=/head/; revision=315051