summaryrefslogtreecommitdiffstats
path: root/usr.bin/join
diff options
context:
space:
mode:
authormaxim <maxim@FreeBSD.org>2004-08-26 06:28:05 +0000
committermaxim <maxim@FreeBSD.org>2004-08-26 06:28:05 +0000
commite21edac0ea1488fac89046ebc8f879f89b7a6b58 (patch)
tree0eeb0e7fce5e38950f5fd2e993370ec8a6b3ccef /usr.bin/join
parentcc42042e49eb1af06c02974d5b90c2cdc1c0c5a0 (diff)
downloadFreeBSD-src-e21edac0ea1488fac89046ebc8f879f89b7a6b58.zip
FreeBSD-src-e21edac0ea1488fac89046ebc8f879f89b7a6b58.tar.gz
Backout recent -j changes, the flags is deprecated.
Requested by: tjr
Diffstat (limited to 'usr.bin/join')
-rw-r--r--usr.bin/join/join.11
-rw-r--r--usr.bin/join/join.c9
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index d7d115e..aa6f739 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -47,7 +47,6 @@
.Fl a Ar file_number | Fl v Ar file_number
.Oc
.Op Fl e Ar string
-.Op Fl j Ar fileno field
.Op Fl o Ar list
.Bk -words
.Ek
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 5e45850..097ecbe 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -661,10 +661,9 @@ jbad: errx(1, "illegal option -- %s", ap);
void
usage(void)
{
- (void)fprintf(stderr, "%s %s\n%s %s\n",
- "usage: join [-a fileno | -v fileno ]",
- "[-e string] [-j fileno field]",
- " [-1 field] [-2 field]",
- "[-o list] [-t char] file1 file2");
+ (void)fprintf(stderr, "%s %s\n%s\n",
+ "usage: join [-a fileno | -v fileno ] [-e string] [-1 field]",
+ "[-2 field]",
+ " [-o list] [-t char] file1 file2");
exit(1);
}
OpenPOWER on IntegriCloud