summaryrefslogtreecommitdiffstats
path: root/contrib/diff
Commit message (Collapse)AuthorAgeFilesLines
* Make diff(1) follow traditional UNIX SOP of later options nullify earlierobrien2005-06-031-3/+0
| | | | options that are mutually exclusive.
* Remove files no longer neededache2004-02-165-1061/+3
| | | | Switch back to regex.h
* Terminate the execl() argument list with (char *)NULL instead of 0.harti2003-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.
* Add #include "diff.h" in order to get the prototype for xmalloc().peter2003-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)
* Add back the "\ No newline at end of file" marker that is printed whengad2002-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
* Fix essential typo in usageache2002-05-191-1/+1
| | | | Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>
* *sigh* Misfire. Backout previous commit, as it was meant fornectar2002-01-291-4/+2
| | | | another branch.
* FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead.nectar2002-01-291-2/+4
| | | | | Reported by: Steven Farmer <steve@geoenergycorp.com> Pointy hat to: nectar
* = Fix temporary file handling.nectar2002-01-271-95/+24
| | | | | | | Obtained from: Immunix Linux = Garbage collect now-unused temporary file handling functions. = Add __FBSDID.
* Also coerce diff(1) into working the other way (from no-\n to \n).green2000-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.
* Get rid of the stupid bug where diff sticks trash in your generatedgreen2000-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
* * Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofobrien1999-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.
* Some FreeBSD files to add...ache1997-10-302-0/+142
|
* Temp remove config.h, was imported to FSF branchache1997-10-301-118/+0
|
* This commit was generated by cvs2svn to compensate for changes in r30858,ache1997-10-301-0/+238
|\ | | | | | | which included commits to RCS files with non-trunk default branches.
| * Add file needed for configureache1997-10-301-0/+238
| |
* | -f -> -F for prache1997-10-301-1/+4
| |
* | Localize diffache1997-10-291-0/+8
| |
* | Include <gnuregex.h> for FreeBSDache1997-10-291-0/+4
| |
* | This commit was generated by cvs2svn to compensate for changes in r30839,ache1997-10-291-0/+118
|\ \ | |/ |/| | | which included commits to RCS files with non-trunk default branches.
| * Initial importache1997-10-291-0/+118
|
* Initial importache1997-10-2932-0/+18811
OpenPOWER on IntegriCloud