From 901a475b7a24b2d4eec2c0e006f0c7f78abd3789 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 12 Mar 2017 03:49:05 +0000 Subject: [PATCH] Implement a stub --horizon-lines=NUM for compatibility with GNU diff3 some options of GNU diff3 would call diff with --horizon-lines, rcs is depending on that. Reported by: antoine --- usr.bin/diff/diff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index fa8b7cc5f1c..c5f0632568d 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -54,6 +54,7 @@ enum { OPT_IGN_FN_CASE, OPT_NO_IGN_FN_CASE, OPT_NORMAL, + OPT_HORIZON_LINES, }; static struct option longopts[] = { @@ -83,6 +84,7 @@ static struct option longopts[] = { { "exclude", required_argument, 0, 'x' }, { "exclude-from", required_argument, 0, 'X' }, { "ignore-file-name-case", no_argument, NULL, OPT_IGN_FN_CASE }, + { "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 }, { "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR }, @@ -225,6 +227,8 @@ main(int argc, char **argv) case 'x': push_excludes(optarg); break; + case OPT_HORIZON_LINES: + break; /* XXX TODO for compatibility with GNU diff3 */ case OPT_IGN_FN_CASE: ignore_file_case = 1; break;