mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-30 08:19:09 +00:00
Code Issues Releases Activity
292,671 Commits 336 Branches 3,544 Tags 2 GiB
7818c2d37c
Commit Graph

40 Commits

Author SHA1 Message Date
Warner Losh
d37eb51047 contrib: Remove various $FreeBSD$ tags not upstream 
Sponsored by:		Netflix
 2024-05-31 13:49:17 -06:00
Ed Maste
3a13b5ac83 gnu diff3: apply patch to committed src, rather than at build time 
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
 2022-11-13 21:33:40 -05:00
Alex Richardson
7954ad9f22 Fix macro-redefined warning in gnu/diff for fputc_unlocked 
While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update
the other macros that are defined in stdio.h.
 2021-01-19 21:23:25 +00:00
Marcelo Araujo
9310c7d568 Fix the wrong format, format specifies type 'int' but the argument has type 
'long', it was spotted by clang.

Differential Revision:	D2663
Reviewed by:		imp, rodrigc
 2015-06-01 06:14:17 +00:00
Baptiste Daroussin
2fd5d19071 Convert texinfo to mdoc(7) using texi2mdoc 2015-03-02 11:48:00 +00:00
Warren Block
998db43a8d Fix a cut and paste error. 
PR:		docs/184791
Submitted by:	Jamie Landeg Jones <jamie@dyslexicfish.net>
MFC after:	3 days
 2014-01-05 23:28:03 +00:00
David E. O'Brien
6f5e32433e Catch up with the subversion conversion and apply these build-time patches. 2012-08-17 18:20:38 +00:00
Xin LI
3abc9103eb This commit was generated by cvs2svn to compensate for changes in r171490, 
which included commits to RCS files with non-trunk default branches.
 2007-07-19 06:57:46 +00:00
Xin LI
fbe3980a4b Remove unused FSF source files. 
Approved by:	re (hrs)
 2007-07-19 06:57:46 +00:00
Xin LI
db062bd2e6 This commit was generated by cvs2svn to compensate for changes in r170764, 
which included commits to RCS files with non-trunk default branches.
 2007-06-15 07:49:35 +00:00
Xin LI
b61bbb7026 Apply vendor patch that implements 1/2 as aliases of l/r. 
Requested by:   dmalone, Chuck Swiger
 2007-06-15 07:49:35 +00:00
Xin LI
9095b74af6 Update instructions about upgrading. 2007-06-15 07:36:39 +00:00
Xin LI
6a0c0f1b7e Add a list of removed files during import 2007-06-15 07:28:00 +00:00
Xin LI
752f8af9a8 Remove files that were taken off vendor branch. Difference 
against vendor branch is now maintained in patchsets.
 2007-06-15 07:22:26 +00:00
Xin LI
4366265d16 Remove old files that no longer exist in latest distribution or 
removed during import.
 2007-06-15 07:17:50 +00:00
Xin LI
52d5bdcdbc This commit was generated by cvs2svn to compensate for changes in r170759, 
which included commits to RCS files with non-trunk default branches.
 2007-06-15 07:17:50 +00:00
Xin LI
3070b40134 Localized regeneration of config.h. 2007-06-15 07:08:19 +00:00
Xin LI
18fd37a72c Virgin import of diffutils 2.8.7. 2007-06-15 07:06:13 +00:00
Xin LI
967d234ef3 This commit was generated by cvs2svn to compensate for changes in r170754, 
which included commits to RCS files with non-trunk default branches.
 2007-06-15 07:06:13 +00:00
David E. O'Brien
28832e4b79 Make diff(1) follow traditional UNIX SOP of later options nullify earlier 
options that are mutually exclusive.
 2005-06-03 06:46:56 +00:00
Andrey A. Chernov
af210d1ee6 Remove files no longer needed 
Switch back to regex.h
 2004-02-16 22:56:36 +00:00
Hartmut Brandt
b41f9c7d79 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 the
diffutils author, but the file is already off the vendor branch, so
correct it here in the meanwhile too.
 2003-11-03 12:41:27 +00:00
Peter Wemm
edf112ec42 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 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)
 2003-01-08 06:40:35 +00:00
Garance A Drosehn
080d74478e Add back the "\ No newline at end of file" marker that is printed when 
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
 2002-11-25 22:59:52 +00:00
Andrey A. Chernov
c4aa5b8efe Fix essential typo in usage 
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
 2002-05-19 10:40:15 +00:00
Jacques Vidrine
3e838acb26 *sigh* Misfire. Backout previous commit, as it was meant for 
another branch.
 2002-01-29 17:40:45 +00:00
Jacques Vidrine
5dd418263a FreeBSD 4.4 doesn't have __FBSDID. Do it the old-fashioned way instead. 
Reported by:	Steven Farmer <steve@geoenergycorp.com>
Pointy hat to:	nectar
 2002-01-29 17:11:28 +00:00
Jacques Vidrine
479608bf54 = Fix temporary file handling. 
Obtained from:	Immunix Linux

= Garbage collect now-unused temporary file handling functions.
= Add __FBSDID.
 2002-01-27 16:43:35 +00:00
Brian Feldman
0fbf304b54 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 the
other way any better, so replace it with printing a single \n.
 2000-09-15 11:35:16 +00:00
Brian Feldman
0c09388123 Get rid of the stupid bug where diff sticks trash in your generated 
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
 2000-07-24 07:40:02 +00:00
David E. O'Brien
20ee132cae * Support the environtmental var "DIFF_OPTIONS". Which can hold a set of 
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.
 1999-11-26 02:51:44 +00:00
Andrey A. Chernov
53ba4fe663 Some FreeBSD files to add... 1997-10-30 19:35:17 +00:00
Andrey A. Chernov
b5935e1422 Temp remove config.h, was imported to FSF branch 1997-10-30 19:34:01 +00:00
Andrey A. Chernov
964382dc00 Add file needed for configure 1997-10-30 19:13:48 +00:00
Andrey A. Chernov
006b6b8074 This commit was generated by cvs2svn to compensate for changes in r30858, 
which included commits to RCS files with non-trunk default branches.
 1997-10-30 19:13:48 +00:00
Andrey A. Chernov
a85388f609 -f -> -F for pr 1997-10-30 19:07:39 +00:00
Andrey A. Chernov
bb3e4497dd Localize diff 1997-10-29 17:17:32 +00:00
Andrey A. Chernov
587c681815 Include <gnuregex.h> for FreeBSD 1997-10-29 16:27:56 +00:00
Andrey A. Chernov
f5e00e241f Initial import 1997-10-29 16:14:35 +00:00
Andrey A. Chernov
4be67e9c5a This commit was generated by cvs2svn to compensate for changes in r30839, 
which included commits to RCS files with non-trunk default branches.
 1997-10-29 16:14:35 +00:00