src/contrib/diff, branch releng/6.2 FreeBSD source tree Make diff(1) follow traditional UNIX SOP of later options nullify earlier 2005-06-03T06:46:56+00:00 David E. O'Brien obrien@FreeBSD.org 2005-06-03T06:46:56+00:00 28832e4b7973c204037046cf2ec4de97b81dcce0 options that are mutually exclusive. 
options that are mutually exclusive.
Remove files no longer needed 2004-02-16T22:56:36+00:00 Andrey A. Chernov ache@FreeBSD.org 2004-02-16T22:56:36+00:00 af210d1ee6c88381d94ee9d3dcfaceb584cea617 Switch back to regex.h 
Switch back to regex.h
Terminate the execl() argument list with (char *)NULL instead of 0. 2003-11-03T12:41:27+00:00 Hartmut Brandt harti@FreeBSD.org 2003-11-03T12:41:27+00:00 b41f9c7d796d10ecdb1d68b1de9b5255c0995a32 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. 
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(). 2003-01-08T06:40:35+00:00 Peter Wemm peter@FreeBSD.org 2003-01-08T06:40:35+00:00 edf112ec42b7b886a3e9c437d94aad15012c553b 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) 
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 when 2002-11-25T22:59:52+00:00 Garance A Drosehn gad@FreeBSD.org 2002-11-25T22:59:52+00:00 080d74478e729359caf36b5a985a640c1647e8ca 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 
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 usage 2002-05-19T10:40:15+00:00 Andrey A. Chernov ache@FreeBSD.org 2002-05-19T10:40:15+00:00 c4aa5b8efedf03ca5160ae2b490c3639d35cc303 Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net> 
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
*sigh* Misfire. Backout previous commit, as it was meant for 2002-01-29T17:40:45+00:00 Jacques Vidrine nectar@FreeBSD.org 2002-01-29T17:40:45+00:00 3e838acb26a2e2a7008124c3d489aa672aaff862 another branch. 
another branch.
FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead. 2002-01-29T17:11:28+00:00 Jacques Vidrine nectar@FreeBSD.org 2002-01-29T17:11:28+00:00 5dd418263a56a74c0847cd51d5f7fcd3886ffe43 Reported by: Steven Farmer <steve@geoenergycorp.com> Pointy hat to: nectar 
Reported by:	Steven Farmer <steve@geoenergycorp.com>
Pointy hat to:	nectar
= Fix temporary file handling. 2002-01-27T16:43:35+00:00 Jacques Vidrine nectar@FreeBSD.org 2002-01-27T16:43:35+00:00 479608bf54623b59dd1717e4d54545e581556d98 Obtained from: Immunix Linux = Garbage collect now-unused temporary file handling functions. = Add __FBSDID. 
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). 2000-09-15T11:35:16+00:00 Brian Feldman green@FreeBSD.org 2000-09-15T11:35:16+00:00 0fbf304b545a529e4f2bccf41fca8db5805de075 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. 
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.