summaryrefslogtreecommitdiff
path: root/contrib/diff
AgeCommit message (Collapse)Author
2025-11-18diff3: Use logical-not, not bitwise for booleansEd Maste
And compare impcompat != 0 as it's actually an integer incremented on each use of one of the AeExX3 options. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53808
2025-11-18diff3: Remove bespoke getopt.hEd Maste
diff3's getopt.h included a function declaration without a prototype, which produces a compiler warning. Just remove the bespoke getopt.h and use the system header. Reported by: Mark Millard Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53802
2024-05-31contrib: Remove various $FreeBSD$ tags not upstreamWarner Losh
Sponsored by: Netflix
2022-11-13gnu diff3: apply patch to committed src, rather than at build timeEd Maste
This appears to be a leftover from the time we used a less-capable VCS. Reviewed by: delphij MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37368
2021-01-19Fix macro-redefined warning in gnu/diff for fputc_unlockedAlex Richardson
While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update the other macros that are defined in stdio.h.
2015-06-01Fix the wrong format, format specifies type 'int' but the argument has typeMarcelo Araujo
'long', it was spotted by clang. Differential Revision: D2663 Reviewed by: imp, rodrigc Notes: svn path=/head/; revision=283869
2015-03-02Convert texinfo to mdoc(7) using texi2mdocBaptiste Daroussin
Notes: svn path=/head/; revision=279519
2014-01-05Fix a cut and paste error.Warren Block
PR: docs/184791 Submitted by: Jamie Landeg Jones <jamie@dyslexicfish.net> MFC after: 3 days Notes: svn path=/head/; revision=260358
2012-08-17Catch up with the subversion conversion and apply these build-time patches.David E. O'Brien
Notes: svn path=/head/; revision=239360
2007-07-19This commit was generated by cvs2svn to compensate for changes in r171490,Xin LI
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=171491
2007-07-19Remove unused FSF source files.Xin LI
Approved by: re (hrs) Notes: svn path=/head/; revision=171490
2007-06-15This commit was generated by cvs2svn to compensate for changes in r170764,Xin LI
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170765
2007-06-15Apply vendor patch that implements 1/2 as aliases of l/r.Xin LI
Requested by: dmalone, Chuck Swiger Notes: svn path=/vendor/diff/dist/; revision=170764
2007-06-15Update instructions about upgrading.Xin LI
Notes: svn path=/head/; revision=170763
2007-06-15Add a list of removed files during importXin LI
Notes: svn path=/head/; revision=170762
2007-06-15Remove files that were taken off vendor branch. DifferenceXin LI
against vendor branch is now maintained in patchsets. Notes: svn path=/head/; revision=170761
2007-06-15Remove old files that no longer exist in latest distribution orvendor/misc-GNU/diff/2.8.7Xin LI
removed during import. Notes: svn path=/vendor/diff/dist/; revision=170759 svn path=/vendor/diff/2.8.7/; revision=170756; tag=vendor/misc-GNU/diff/2.8.7
2007-06-15This commit was generated by cvs2svn to compensate for changes in r170759,Xin LI
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170760
2007-06-15Localized regeneration of config.h.Xin LI
Notes: svn path=/head/; revision=170757
2007-06-15Virgin import of diffutils 2.8.7.Xin LI
Notes: svn path=/vendor/diff/dist/; revision=170754
2007-06-15This commit was generated by cvs2svn to compensate for changes in r170754,Xin LI
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170755
2005-06-03Make diff(1) follow traditional UNIX SOP of later options nullify earlierDavid E. O'Brien
options that are mutually exclusive. Notes: svn path=/head/; revision=146916
2004-02-16Remove files no longer neededAndrey A. Chernov
Switch back to regex.h Notes: svn path=/head/; revision=125895
2003-11-03Terminate the execl() argument list with (char *)NULL instead of 0.Hartmut Brandt
The later is wrong and may fail on sizeof(char *) != sizeof(int) machines. The patch has already been sent to and accepted by the diffutils author, but the file is already off the vendor branch, so correct it here in the meanwhile too. Notes: svn path=/head/; revision=121951
2003-01-08Add #include "diff.h" in order to get the prototype for xmalloc().Peter Wemm
The corresponding warning has been ignored for ages: prepend_args.c:75: warning: initialization makes pointer from integer without a cast This is fatal on ia64. You cannot convert an implicit int return from an undeclared function to a pointer as you've lost the upper 32 bits. On ia64, the warning is "pointer from different sized integer". (This file is not vendor branched) Notes: svn path=/head/; revision=108928
2002-11-25Add back the "\ No newline at end of file" marker that is printed whenGarance A Drosehn
comparing two files, where only one file is missing the final newline character. This undoes revisions 1.3 and 1.4, returning 'diff' to how it behaved before July 2000. We can do this now because our version of 'patch' was modified (just before 4.6-release) to understand what to do with that line. This marker is the same one generated by 'diff' under netbsd, openbsd, darwin, and linux (and any OS with "gnu-diff" installed). Reviewed by: imp freebsd-standards (back in april) Approved by: re (bmah) MFC after: 1 week Notes: svn path=/head/; revision=107251
2002-05-19Fix essential typo in usageAndrey A. Chernov
Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net> Notes: svn path=/head/; revision=96940
2002-01-29*sigh* Misfire. Backout previous commit, as it was meant forJacques Vidrine
another branch. Notes: svn path=/head/; revision=89963
2002-01-29FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead.Jacques Vidrine
Reported by: Steven Farmer <steve@geoenergycorp.com> Pointy hat to: nectar Notes: svn path=/head/; revision=89960
2002-01-27= Fix temporary file handling.Jacques Vidrine
Obtained from: Immunix Linux = Garbage collect now-unused temporary file handling functions. = Add __FBSDID. Notes: svn path=/head/; revision=89881
2000-09-15Also coerce diff(1) into working the other way (from no-\n to \n).Brian Feldman
Taking out the evil warning fixed it one way, but didn't make the other way any better, so replace it with printing a single \n. Notes: svn path=/head/; revision=65889
2000-07-24Get rid of the stupid bug where diff sticks trash in your generatedBrian Feldman
diff output; there being no trailing newline caused it to bitch and moan and ruin diffs. That's dumb, if I may say so myself. Yes, this file is coming off the vendor branch. It hasn't been updated in 6 years. Approved by: peter Notes: svn path=/head/; revision=63789
1999-11-26* Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofDavid E. O'Brien
default options for diff. These options are interpreted first and can be overwritten by explicit command line parameters. * Add the "-o" option to specify old-traditional output style. * Add utility functions for env vars obtained from GNU Grep 2.3h. Notes: svn path=/head/; revision=53703
1997-10-30Some FreeBSD files to add...Andrey A. Chernov
Notes: svn path=/head/; revision=30862
1997-10-30Temp remove config.h, was imported to FSF branchAndrey A. Chernov
Notes: svn path=/head/; revision=30861
1997-10-30Add file needed for configurevendor/misc-GNU/diff/2.7Andrey A. Chernov
Notes: svn path=/vendor/diff/dist/; revision=30858 svn path=/vendor/diff/2.7/; revision=30860; tag=vendor/misc-GNU/diff/2.7
1997-10-30This commit was generated by cvs2svn to compensate for changes in r30858,Andrey A. Chernov
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=30859
1997-10-30-f -> -F for prAndrey A. Chernov
Notes: svn path=/head/; revision=30857
1997-10-29Localize diffAndrey A. Chernov
Notes: svn path=/head/; revision=30845
1997-10-29Include <gnuregex.h> for FreeBSDAndrey A. Chernov
Notes: svn path=/head/; revision=30841
1997-10-29Initial importAndrey A. Chernov
Notes: svn path=/vendor/diff/dist/; revision=30839
1997-10-29This commit was generated by cvs2svn to compensate for changes in r30839,Andrey A. Chernov
which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=30840
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-22 00:35:18 +0000