d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
267,466 Commits 4 Branches 49 Tags 2 GiB
ccbdd2158b
Commit Graph

38 Commits

Author SHA1 Message Date
araujo
3f5fa5a6f7 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
bapt
577a7f53d5 Convert texinfo to mdoc(7) using texi2mdoc 2015-03-02 11:48:00 +00:00
wblock
0d91dd56df 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
obrien
a941b72fdc Catch up with the subversion conversion and apply these build-time patches. 2012-08-17 18:20:38 +00:00
delphij
5c37d64eb9 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
delphij
a9b127823d Remove unused FSF source files. 
Approved by:	re (hrs)
 2007-07-19 06:57:46 +00:00
delphij
d4335e2e0b 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
delphij
f165f20f9e 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
delphij
3a21074c9c Update instructions about upgrading. 2007-06-15 07:36:39 +00:00
delphij
df12e14874 Add a list of removed files during import 2007-06-15 07:28:00 +00:00
delphij
2a4f71e2a0 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
delphij
126c063fa1 Remove old files that no longer exist in latest distribution or 
removed during import.
 2007-06-15 07:17:50 +00:00
delphij
019bb6b05e 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
delphij
dc06cc570e Localized regeneration of config.h. 2007-06-15 07:08:19 +00:00
delphij
40ec4fdc9a Virgin import of diffutils 2.8.7. 2007-06-15 07:06:13 +00:00
delphij
378be1e34d 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
obrien
a1ccaaff09 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
ache
d034a2d7ec Remove files no longer needed 
Switch back to regex.h
 2004-02-16 22:56:36 +00:00
harti
378fe256e4 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
62808c2618 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
gad
7a97c3ad50 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
ache
6992c205d1 Fix essential typo in usage 
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>
 2002-05-19 10:40:15 +00:00
nectar
0d545984ad *sigh* Misfire. Backout previous commit, as it was meant for 
another branch.
 2002-01-29 17:40:45 +00:00
nectar
31c2c5362e 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
nectar
9fdf88975b = 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
green
85ac235bec 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
green
78de2a5609 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
obrien
46689ca7f0 * 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
ache
11e7abd36c Some FreeBSD files to add... 1997-10-30 19:35:17 +00:00
ache
764fe6ddf3 Temp remove config.h, was imported to FSF branch 1997-10-30 19:34:01 +00:00
ache
f75ef5d3d4 Add file needed for configure 1997-10-30 19:13:48 +00:00
ache
3bc106256b 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
ache
9ddc05e9fe -f -> -F for pr 1997-10-30 19:07:39 +00:00
ache
11845f8156 Localize diff 1997-10-29 17:17:32 +00:00
ache
692df03d54 Include <gnuregex.h> for FreeBSD 1997-10-29 16:27:56 +00:00
ache
cee6432e98 Initial import 1997-10-29 16:14:35 +00:00
ache
8dcc9192ee 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
ache
2930d5cccf Initial import 1997-10-29 16:14:35 +00:00