summaryrefslogtreecommitdiff
path: root/usr.bin/join
diff options
context:
space:
mode:
authorMaxim Konovalov <maxim@FreeBSD.org>2004-08-26 06:28:05 +0000
committerMaxim Konovalov <maxim@FreeBSD.org>2004-08-26 06:28:05 +0000
commit9d455d451b20f666c6b5a997c45248ade2ec3a8f (patch)
tree0eeb0e7fce5e38950f5fd2e993370ec8a6b3ccef /usr.bin/join
parent096ad1042a55c01aea5461fd80b623a42eba8cd5 (diff)
downloadsrc-test-9d455d451b20f666c6b5a997c45248ade2ec3a8f.tar.gz
src-test-9d455d451b20f666c6b5a997c45248ade2ec3a8f.zip
Backout recent -j changes, the flags is deprecated.
Requested by: tjr
Notes
Notes: svn path=/head/; revision=134333
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 d7d115ee5cae5..aa6f73903a9c9 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 5e4585010188e..097ecbe743f9b 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);
}