aboutsummaryrefslogtreecommitdiff
path: root/contrib/diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix macro-redefined warning in gnu/diff for fputc_unlockedAlex Richardson2021-01-191-5/+5
| | | | | While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update the other macros that are defined in stdio.h.
* Fix the wrong format, format specifies type 'int' but the argument has typeMarcelo Araujo2015-06-011-1/+1
| | | | | | | | | | 'long', it was spotted by clang. Differential Revision: D2663 Reviewed by: imp, rodrigc Notes: svn path=/head/; revision=283869
* Convert texinfo to mdoc(7) using texi2mdocBaptiste Daroussin2015-03-021-0/+6287
| | | | Notes: svn path=/head/; revision=279519
* Fix a cut and paste error.Warren Block2014-01-051-1/+1
| | | | | | | | | PR: docs/184791 Submitted by: Jamie Landeg Jones <jamie@dyslexicfish.net> MFC after: 3 days Notes: svn path=/head/; revision=260358
* Catch up with the subversion conversion and apply these build-time patches.David E. O'Brien2012-08-172-9/+13
| | | | Notes: svn path=/head/; revision=239360
* This commit was generated by cvs2svn to compensate for changes in r171490,Xin LI2007-07-1944-15265/+0
| | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=171491
* Remove unused FSF source files.Xin LI2007-07-191-9/+53
| | | | | | | Approved by: re (hrs) Notes: svn path=/head/; revision=171490
* This commit was generated by cvs2svn to compensate for changes in r170764,Xin LI2007-06-152-11/+16
|\ | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170765
| * Apply vendor patch that implements 1/2 as aliases of l/r.Xin LI2007-06-152-11/+16
| | | | | | | | | | | | | | Requested by: dmalone, Chuck Swiger Notes: svn path=/vendor/diff/dist/; revision=170764
| * Remove old files that no longer exist in latest distribution orvendor/misc-GNU/diff/2.8.7Xin LI2007-06-1529-16809/+0
| | | | | | | | | | | | | | | | 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
* | Update instructions about upgrading.Xin LI2007-06-151-23/+3
| | | | | | | | Notes: svn path=/head/; revision=170763
* | Add a list of removed files during importXin LI2007-06-151-0/+17
| | | | | | | | Notes: svn path=/head/; revision=170762
* | Remove files that were taken off vendor branch. DifferenceXin LI2007-06-156-3438/+0
| | | | | | | | | | | | | | against vendor branch is now maintained in patchsets. Notes: svn path=/head/; revision=170761
* | This commit was generated by cvs2svn to compensate for changes in r170759,Xin LI2007-06-1522-12372/+0
| | | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170760
* | Localized regeneration of config.h.Xin LI2007-06-151-71/+526
| | | | | | | | Notes: svn path=/head/; revision=170757
* | This commit was generated by cvs2svn to compensate for changes in r170754,Xin LI2007-06-15113-28/+38786
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=170755
| * Virgin import of diffutils 2.8.7.Xin LI2007-06-15113-28/+38786
| | | | | | | | Notes: svn path=/vendor/diff/dist/; revision=170754
* | Make diff(1) follow traditional UNIX SOP of later options nullify earlierDavid E. O'Brien2005-06-031-3/+0
| | | | | | | | | | | | | | options that are mutually exclusive. Notes: svn path=/head/; revision=146916
* | Remove files no longer neededAndrey A. Chernov2004-02-165-1061/+3
| | | | | | | | | | | | | | Switch back to regex.h Notes: svn path=/head/; revision=125895
* | Terminate the execl() argument list with (char *)NULL instead of 0.Hartmut Brandt2003-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | 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
* | Add #include "diff.h" in order to get the prototype for xmalloc().Peter Wemm2003-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Add back the "\ No newline at end of file" marker that is printed whenGarance A Drosehn2002-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix essential typo in usageAndrey A. Chernov2002-05-191-1/+1
| | | | | | | | | | | | | | Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net> Notes: svn path=/head/; revision=96940
* | *sigh* Misfire. Backout previous commit, as it was meant forJacques Vidrine2002-01-291-4/+2
| | | | | | | | | | | | | | another branch. Notes: svn path=/head/; revision=89963
* | FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead.Jacques Vidrine2002-01-291-2/+4
| | | | | | | | | | | | | | | | Reported by: Steven Farmer <steve@geoenergycorp.com> Pointy hat to: nectar Notes: svn path=/head/; revision=89960
* | = Fix temporary file handling.Jacques Vidrine2002-01-271-95/+24
| | | | | | | | | | | | | | | | | | | | Obtained from: Immunix Linux = Garbage collect now-unused temporary file handling functions. = Add __FBSDID. Notes: svn path=/head/; revision=89881
* | Also coerce diff(1) into working the other way (from no-\n to \n).Brian Feldman2000-09-151-0/+3
| | | | | | | | | | | | | | | | 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
* | Get rid of the stupid bug where diff sticks trash in your generatedBrian Feldman2000-07-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | * Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofDavid E. O'Brien1999-11-263-1/+118
| | | | | | | | | | | | | | | | | | | | 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
* | Some FreeBSD files to add...Andrey A. Chernov1997-10-302-0/+142
| | | | | | | | Notes: svn path=/head/; revision=30862
* | Temp remove config.h, was imported to FSF branchAndrey A. Chernov1997-10-301-118/+0
| | | | | | | | Notes: svn path=/head/; revision=30861
* | This commit was generated by cvs2svn to compensate for changes in r30858,Andrey A. Chernov1997-10-301-0/+238
|\| | | | | | | | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=30859
| * Add file needed for configurevendor/misc-GNU/diff/2.7Andrey A. Chernov1997-10-301-0/+238
| | | | | | | | | | Notes: svn path=/vendor/diff/dist/; revision=30858 svn path=/vendor/diff/2.7/; revision=30860; tag=vendor/misc-GNU/diff/2.7
* | -f -> -F for prAndrey A. Chernov1997-10-301-1/+4
| | | | | | | | Notes: svn path=/head/; revision=30857
* | Localize diffAndrey A. Chernov1997-10-291-0/+8
| | | | | | | | Notes: svn path=/head/; revision=30845
* | Include <gnuregex.h> for FreeBSDAndrey A. Chernov1997-10-291-0/+4
| | | | | | | | Notes: svn path=/head/; revision=30841
* | This commit was generated by cvs2svn to compensate for changes in r30839,Andrey A. Chernov1997-10-291-0/+118
|/ | | | | | | which included commits to RCS files with non-trunk default branches. Notes: svn path=/head/; revision=30840
* Initial importAndrey A. Chernov1997-10-2932-0/+18811
Notes: svn path=/vendor/diff/dist/; revision=30839