d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -H as an alias for --speed-large-file to match GNU diff.

Browse Source 
This is undocumented to match GNU diff where -H is also undocumented.
Some existing software (such as kompare) uses this option by default.

Reviewed by:	emaste, rpokala
Differential Revision:	https://reviews.freebsd.org/D11022
This commit is contained in:
John Baldwin 2017-06-02 03:25:59 +00:00
parent 13eb5b4943
commit ea67c7a015
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/diff/diff.c
View File

@ -46,7 +46,7 @@ struct stat stb1, stb2;
struct excludes *excludes_list; struct excludes *excludes_list;
regex_t ignore_re; regex_t ignore_re;
#define OPTIONS "0123456789aBbC:cdD:efhI:iL:lnNPpqrS:sTtU:uwX:x:" #define OPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwX:x:"
enum { enum {
OPT_TSIZE = CHAR_MAX + 1, OPT_TSIZE = CHAR_MAX + 1,
OPT_STRIPCR, OPT_STRIPCR,
@ -54,7 +54,6 @@ enum {
OPT_NO_IGN_FN_CASE, OPT_NO_IGN_FN_CASE,
OPT_NORMAL, OPT_NORMAL,
OPT_HORIZON_LINES, OPT_HORIZON_LINES,
OPT_SPEED_LARGE_FILES,
OPT_CHANGED_GROUP_FORMAT, OPT_CHANGED_GROUP_FORMAT,
}; };
@ -66,6 +65,7 @@ static struct option longopts[] = {
{ "minimal", no_argument, 0, 'd' }, { "minimal", no_argument, 0, 'd' },
{ "ed", no_argument, 0, 'e' }, { "ed", no_argument, 0, 'e' },
{ "forward-ed", no_argument, 0, 'f' }, { "forward-ed", no_argument, 0, 'f' },
{ "speed-large-files", no_argument, NULL, 'H' },
{ "ignore-matching-lines", required_argument, 0, 'I' }, { "ignore-matching-lines", required_argument, 0, 'I' },
{ "ignore-case", no_argument, 0, 'i' }, { "ignore-case", no_argument, 0, 'i' },
{ "paginate", no_argument, NULL, 'l' }, { "paginate", no_argument, NULL, 'l' },
@ -88,7 +88,6 @@ static struct option longopts[] = {
{ "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES }, { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES },
{ "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE }, { "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE },
{ "normal", no_argument, NULL, OPT_NORMAL }, { "normal", no_argument, NULL, OPT_NORMAL },
{ "speed-large-files", no_argument, NULL, OPT_SPEED_LARGE_FILES},
{ "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR }, { "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR },
{ "tabsize", optional_argument, NULL, OPT_TSIZE }, { "tabsize", optional_argument, NULL, OPT_TSIZE },
{ "changed-group-format", required_argument, NULL, OPT_CHANGED_GROUP_FORMAT}, { "changed-group-format", required_argument, NULL, OPT_CHANGED_GROUP_FORMAT},
@ -159,6 +158,9 @@ main(int argc, char **argv)
case 'f': case 'f':
diff_format = D_REVERSE; diff_format = D_REVERSE;
break; break;
case 'H':
/* ignore but needed for compatibility with GNU diff */
break;
case 'h': case 'h':
/* silently ignore for backwards compatibility */ /* silently ignore for backwards compatibility */
break; break;
@ -252,8 +254,6 @@ main(int argc, char **argv)
usage(); usage();
} }
break; break;
case OPT_SPEED_LARGE_FILES:
break; /* ignore but needed for compatibility with GNU diff */
case OPT_STRIPCR: case OPT_STRIPCR:
dflags |= D_STRIPCR; dflags |= D_STRIPCR;
break; break;