Implement the -L and -T options from GNU diff.

1 files changed, 27 insertions, 15 deletions

diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 63eaf893175..4103d271649 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.15 2003/07/21 23:18:21 millert Exp $
+.\" $OpenBSD: diff.1,v 1.16 2003/07/22 01:16:01 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 June 25, 2003
+.Dd July 21, 2003
 .Dt DIFF 1
 .Os
 .Sh NAME
@@ -37,31 +37,35 @@
 .Nd differential file and directory comparator
 .Sh SYNOPSIS
 .Nm diff
-.Op Fl abilqtw
+.Op Fl abilqtTw
 .Oo
 .Fl c | Fl e | Fl f |
 .Fl n | Fl u
 .Oc
+.Op Fl L Ar label
 .Ar file1 file2
 .Nm diff
-.Op Fl abilqtw
-.Op Fl C Ar number
+.Op Fl abilqtTw
+.Op Fl L Ar label
+.Fl C Ar number
 .Ar file1 file2
 .Nm diff
 .Op Fl abilqtw
-.Op Fl D Ar string
+.Fl D Ar string
 .Ar file1 file2
 .Nm diff
-.Op Fl abilqtw
-.Op Fl U Ar number
+.Op Fl abilqtTw
+.Op Fl L Ar label
+.Fl U Ar number
 .Ar file1 file2
 .Nm diff
-.Op Fl abilNqtw
+.Op Fl abilNqtTw
 .Oo
 .Fl c | Fl e | Fl f |
 .Fl n | Fl u
 .Oc
 .Bk -words
+.Op Fl L Ar label
 .Op Fl r
 .Op Fl s
 .Op Fl S Ar name
@@ -178,6 +182,12 @@ Treat all files as ASCII.
 .It Fl b
 Causes trailing blanks (spaces and tabs) to be ignored, and other
 strings of blanks to compare equal.
+.It Fl i
+Ignores the case of letters.
+E.g.,
+.Dq A
+will compare equal to
+.Dq a .
 .It Fl l
 Long output format; each text file
 .Nm diff Ns \'d
@@ -186,12 +196,10 @@ is piped through
 to paginate it;
 other differences are remembered and summarized
 after all text file differences are reported.
-.It Fl i
-Ignores the case of letters.
-E.g.,
-.Dq A
-will compare equal to
-.Dq a .
+.It Fl L Ar label
+Print
+.Ar label
+instead of the first file name and time in the context or unified diff header.
 .It Fl t
 Will expand tabs in output lines.
 Normal or
@@ -200,6 +208,10 @@ output adds character(s) to the front of each line which may screw up
 the indentation of the original source lines and make the output listing
 difficult to interpret.
 This option will preserve the original source's indentation.
+.It Fl T
+Print a tab rather than a space before the rest of the line for the
+normal, context or unified output formats.
+This makes the alignment of tabs in the line consistent.
 .It Fl w
 Is similar to
 .Fl b