Fix the wrong format, format specifies type 'int' but the argument has type'long', it was spotted by clang.Differential Revision: D2663Reviewed by: imp, rodrigc
Convert texinfo to mdoc(7) using texi2mdoc
Fix a cut and paste error.PR: docs/184791Submitted by: Jamie Landeg Jones <[email protected]>MFC after: 3 days
Catch up with the subversion conversion and apply these build-time patches.
This commit was generated by cvs2svn to compensate for changes in r171490,which included commits to RCS files with non-trunk default branches.
Remove unused FSF source files.Approved by: re (hrs)
Apply vendor patch that implements 1/2 as aliases of l/r.Requested by: dmalone, Chuck Swiger
Update instructions about upgrading.
Add a list of removed files during import
Remove files that were taken off vendor branch. Differenceagainst vendor branch is now maintained in patchsets.
This commit was generated by cvs2svn to compensate for changes in r170759,which included commits to RCS files with non-trunk default branches.
Localized regeneration of config.h.
Virgin import of diffutils 2.8.7.
Make diff(1) follow traditional UNIX SOP of later options nullify earlieroptions that are mutually exclusive.
Remove files no longer neededSwitch back to regex.h
Terminate the execl() argument list with (char *)NULL instead of 0.The later is wrong and may fail on sizeof(char *) != sizeof(int)machines. The patch has already been sent to and accepted by thed
Terminate the execl() argument list with (char *)NULL instead of 0.The later is wrong and may fail on sizeof(char *) != sizeof(int)machines. The patch has already been sent to and accepted by thediffutils author, but the file is already off the vendor branch, socorrect it here in the meanwhile too.
show more ...
Add #include "diff.h" in order to get the prototype for xmalloc().The corresponding warning has been ignored for ages: prepend_args.c:75: warning: initialization makes pointer from integer witho
Add #include "diff.h" in order to get the prototype for xmalloc().The corresponding warning has been ignored for ages: prepend_args.c:75: warning: initialization makes pointer from integer without a castThis is fatal on ia64. You cannot convert an implicit int return froman 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 whencomparing two files, where only one file is missing the final newlinecharacter. This undoes revisions 1.3 and 1.4, returning '
Add back the "\ No newline at end of file" marker that is printed whencomparing two files, where only one file is missing the final newlinecharacter. This undoes revisions 1.3 and 1.4, returning 'diff' to howit 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 dowith that line. This marker is the same one generated by 'diff' undernetbsd, 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 usageSubmitted by: Cyrille Lefevre <[email protected]>
*sigh* Misfire. Backout previous commit, as it was meant foranother branch.
FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead.Reported by: Steven Farmer <[email protected]>Pointy hat to: nectar
= Fix temporary file handling.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).Taking out the evil warning fixed it one way, but didn't make theother way any better, so replace it with printing a single \n.
Get rid of the stupid bug where diff sticks trash in your generateddiff output; there being no trailing newline caused it to bitch andmoan and ruin diffs. That's dumb, if I may say so myself.Yes
Get rid of the stupid bug where diff sticks trash in your generateddiff output; there being no trailing newline caused it to bitch andmoan and ruin diffs. That's dumb, if I may say so myself.Yes, this file is coming off the vendor branch. It hasn't beenupdated in 6 years.Approved by: peter
* Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofdefault options for diff. These options are interpreted first and can beoverwritten by explicit command line parameters.*
* Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofdefault options for diff. These options are interpreted first and can beoverwritten 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.
12