diff options
Diffstat (limited to 'diff-1-Add-color-support.patch')
| -rw-r--r-- | diff-1-Add-color-support.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/diff-1-Add-color-support.patch b/diff-1-Add-color-support.patch index da8838c..39d9451 100644 --- a/diff-1-Add-color-support.patch +++ b/diff-1-Add-color-support.patch @@ -1,14 +1,14 @@ -From 30124d753b8e95bc4180506b7cd9dfb3280ad364 Mon Sep 17 00:00:00 2001 +From 873c33e92f8a379c3f318f264b2f138658003530 Mon Sep 17 00:00:00 2001 From: Cameron Katri <me@cameronkatri.com> Date: Fri, 28 May 2021 15:21:45 -0400 Subject: [PATCH] diff(1): Add --color support --- usr.bin/diff/diff.1 | 17 ++++++++++ - usr.bin/diff/diff.c | 71 +++++++++++++++++++++++++++++++++++++++++- + usr.bin/diff/diff.c | 70 +++++++++++++++++++++++++++++++++++++++++- usr.bin/diff/diff.h | 3 +- usr.bin/diff/diffreg.c | 16 ++++++++++ - 4 files changed, 105 insertions(+), 2 deletions(-) + 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index e0a790f6efb..50fd43902d5 100644 @@ -81,7 +81,7 @@ index e0a790f6efb..50fd43902d5 100644 Try very hard to produce a diff as small as possible. This may consume a lot of processing power and memory when processing diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c -index 1bad6226f49..b344e9c17cf 100644 +index 1bad6226f49..d9a732db768 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -38,11 +38,18 @@ __FBSDID("$FreeBSD$"); @@ -160,7 +160,7 @@ index 1bad6226f49..b344e9c17cf 100644 #ifdef __OpenBSD__ if (pledge("stdio rpath tmppath", NULL) == -1) err(2, "pledge"); -@@ -550,3 +578,44 @@ conflicting_format(void) +@@ -550,3 +578,43 @@ conflicting_format(void) fprintf(stderr, "error: conflicting output format options.\n"); usage(); } @@ -184,7 +184,6 @@ index 1bad6226f49..b344e9c17cf 100644 + else if (colorflag == COLORFLAG_NEVER) + ret = 0; + -+ printf("do_color(): %i\n", ret); + return ret; +} + |