From 998894f52d3279fe9da0a28921b0b7a119b9e6eb Mon Sep 17 00:00:00 2001 From: millert Date: Thu, 5 Jan 2023 00:00:44 +0000 Subject: [PATCH] Delete remnants of removed "diff -l" option. From Nathan Houghton --- usr.bin/diff/diff.1 | 14 +++++++------- usr.bin/diff/diff.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 85a168d7740..abf65c7e9a0 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff.1,v 1.50 2021/03/08 02:47:27 jsg Exp $ +.\" $OpenBSD: diff.1,v 1.51 2023/01/05 00:00:44 millert Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd $Mdocdate: March 8 2021 $ +.Dd $Mdocdate: January 5 2023 $ .Dt DIFF 1 .Os .Sh NAME @@ -46,24 +46,24 @@ .Op Fl L Ar label .Ar file1 file2 .Nm diff -.Op Fl abdilpTtw +.Op Fl abdipTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl C Ar number .Ar file1 file2 .Nm diff -.Op Fl abdiltw +.Op Fl abditw .Op Fl I Ar pattern .Fl D Ar string .Ar file1 file2 .Nm diff -.Op Fl abdilpTtw +.Op Fl abdipTtw .Op Fl I Ar pattern .Op Fl L Ar label .Fl U Ar number .Ar file1 file2 .Nm diff -.Op Fl abdilNPprsTtw +.Op Fl abdiNPprsTtw .Oo .Fl c | e | f | .Fl n | q | u @@ -466,7 +466,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl aDdIiLlNnPpqSsTtwXx +.Op Fl aDdIiLNnPpqSsTtwXx are extensions to that specification. .Sh HISTORY A diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 5474199b435..2add825a7b7 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.67 2019/06/28 13:35:00 deraadt Exp $ */ +/* $OpenBSD: diff.c,v 1.68 2023/01/05 00:00:44 millert Exp $ */ /* * Copyright (c) 2003 Todd C. Miller @@ -43,7 +43,7 @@ struct stat stb1, stb2; struct excludes *excludes_list; regex_t ignore_re; -#define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uwX:x:" +#define OPTIONS "0123456789abC:cdD:efhI:iL:nNPpqrS:sTtU:uwX:x:" static struct option longopts[] = { { "text", no_argument, 0, 'a' }, { "ignore-space-change", no_argument, 0, 'b' }, -- 2.20.1