aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/diff/diff.17
-rw-r--r--usr.bin/diff/diff.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 7ec168283b9e..aeb4ee15df1a 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -30,7 +30,7 @@
.\" @(#)diff.1 8.1 (Berkeley) 6/30/93
.\" $FreeBSD$
.\"
-.Dd March 22, 2017
+.Dd April 8, 2017
.Dt DIFF 1
.Os
.Sh NAME
@@ -57,6 +57,7 @@
.Op Fl -rcs
.Op Fl -show-c-function
.Op Fl -starting-file
+.Op Fl -speed-large-files
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
.Op Fl -text
@@ -82,6 +83,7 @@
.Op Fl -paginate
.Op Fl -rcs
.Op Fl -show-c-function
+.Op Fl -speed-large-files
.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
@@ -105,6 +107,7 @@
.Op Fl -paginate
.Op Fl -rcs
.Op Fl -show-c-function
+.Op Fl -speed-large-files
.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
@@ -129,6 +132,7 @@
.Op Fl -paginate
.Op Fl -rcs
.Op Fl -show-c-function
+.Op Fl -speed-large-files
.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
@@ -159,6 +163,7 @@
.Op Fl -recursive
.Op Fl -report-identical-files
.Op Fl -show-c-function
+.Op Fl -speed-large-files
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
.Op Fl -text
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index fd0e76ca3b67..ebb4f21c7bf2 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -55,6 +55,7 @@ enum {
OPT_NO_IGN_FN_CASE,
OPT_NORMAL,
OPT_HORIZON_LINES,
+ OPT_SPEED_LARGE_FILES,
};
static struct option longopts[] = {
@@ -87,6 +88,7 @@ static struct option longopts[] = {
{ "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES },
{ "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE },
{ "normal", no_argument, NULL, OPT_NORMAL },
+ { "speed-large-files", no_argument, NULL, OPT_SPEED_LARGE_FILES},
{ "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR },
{ "tabsize", optional_argument, NULL, OPT_TSIZE },
{ NULL, 0, 0, '\0'}
@@ -245,6 +247,8 @@ main(int argc, char **argv)
usage();
}
break;
+ case OPT_SPEED_LARGE_FILES:
+ break; /* ignore but needed for compatibility with GNU diff */
case OPT_STRIPCR:
dflags |= D_STRIPCR;
break;