summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diff.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2003-07-04 17:50:24 +0000
committermillert <millert@openbsd.org>2003-07-04 17:50:24 +0000
commite1b11c9e5e0f50a509c3432dd9b39cb95b3c5d4c (patch)
tree089e94cb31544ff21dc0c1248430797f13b21da6 /usr.bin/diff/diff.c
parentKill diff -h, we don't use or want diffh. Discussed w/ tedu@ (diff)
downloadwireguard-openbsd-e1b11c9e5e0f50a509c3432dd9b39cb95b3c5d4c.tar.xz
wireguard-openbsd-e1b11c9e5e0f50a509c3432dd9b39cb95b3c5d4c.zip
Kill non-standard -l option as discussed with tedu@
Diffstat (limited to 'usr.bin/diff/diff.c')
-rw-r--r--usr.bin/diff/diff.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 72dbcd78d85..813674f9faf 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.20 2003/07/04 17:37:07 millert Exp $ */
+/* $OpenBSD: diff.c,v 1.21 2003/07/04 17:50:24 millert Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -58,7 +58,6 @@ int bflag; /* ignore blanks in comparisons */
int wflag; /* totally ignore blanks in comparisons */
int iflag; /* ignore case in comparisons */
/* Options on hierarchical diffs. */
-int lflag; /* long output format with header */
int rflag; /* recursively trace directories */
int sflag; /* announce files which are same */
char *start; /* do file only if name >= this */
@@ -91,7 +90,7 @@ main(int argc, char **argv)
status = 2;
diffargv = argv;
- while ((ch = getopt(argc, argv, "abC:cD:efilnrS:stU:uw")) != -1) {
+ while ((ch = getopt(argc, argv, "abC:cD:efinrS:stU:uw")) != -1) {
switch (ch) {
case 'a':
aflag++;
@@ -122,9 +121,6 @@ main(int argc, char **argv)
case 'i':
iflag++;
break;
- case 'l':
- lflag++;
- break;
case 'n':
opt = D_NREVERSE;
break;
@@ -260,12 +256,12 @@ __dead void
usage(void)
{
(void)fprintf(stderr,
- "usage: diff [-bitw] [-c | -e | -f | -h | -n | -u ] file1 file2\n"
+ "usage: diff [-bitw] [-c | -e | -f | -n | -u ] file1 file2\n"
" diff [-bitw] -C number file1 file2\n"
" diff [-bitw] -D string file1 file2\n"
" diff [-bitw] -U number file1 file2\n"
- " diff [-biwt] [-c | -e | -f | -h | -n | -u ] "
- "[-l] [-r] [-s] [-S name]\n dir1 dir2\n");
+ " diff [-biwt] [-c | -e | -f | -n | -u ] "
+ "[-r] [-s] [-S name]\n dir1 dir2\n");
exit(2);
}