aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2017-04-20 14:22:33 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2017-04-20 14:22:33 +0000
commitfddcb7b82ff45dc9e08bab26bbfe7a2d2e8ca20f (patch)
tree3e485615652828e8d65ef213796a7cc011a0ddf6 /usr.bin/diff/diff.c
parent431bcfcdbde1606906a9c0be6930992e315dee5a (diff)
Notes
Diffstat (limited to 'usr.bin/diff/diff.c')
-rw-r--r--usr.bin/diff/diff.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 9c20fa182d90..f314e9f76c3f 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -41,6 +41,7 @@ int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag;
int diff_format, diff_context, status, ignore_file_case;
int tabsize = 8;
char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
+char *group_format = NULL;
struct stat stb1, stb2;
struct excludes *excludes_list;
regex_t ignore_re;
@@ -54,6 +55,7 @@ enum {
OPT_NORMAL,
OPT_HORIZON_LINES,
OPT_SPEED_LARGE_FILES,
+ OPT_CHANGED_GROUP_FORMAT,
};
static struct option longopts[] = {
@@ -89,6 +91,7 @@ static struct option longopts[] = {
{ "speed-large-files", no_argument, NULL, OPT_SPEED_LARGE_FILES},
{ "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR },
{ "tabsize", optional_argument, NULL, OPT_TSIZE },
+ { "changed-group-format", required_argument, NULL, OPT_CHANGED_GROUP_FORMAT},
{ NULL, 0, 0, '\0'}
};
@@ -227,6 +230,10 @@ main(int argc, char **argv)
case 'x':
push_excludes(optarg);
break;
+ case OPT_CHANGED_GROUP_FORMAT:
+ diff_format = D_GFORMAT;
+ group_format = optarg;
+ break;
case OPT_HORIZON_LINES:
break; /* XXX TODO for compatibility with GNU diff3 */
case OPT_IGN_FN_CASE: