aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/join
diff options
context:
space:
mode:
authorPhilippe Charnier <charnier@FreeBSD.org>1997-07-15 09:57:28 +0000
committerPhilippe Charnier <charnier@FreeBSD.org>1997-07-15 09:57:28 +0000
commit21a3d1655c02912a2bb423fdafb2f36ebb6127d7 (patch)
tree9239db6f424d2873a1aa92ba0aaf790832feeadd /usr.bin/join
parent00bbaadcfdc9279c8c6f48b09f5eca4cd5145bd8 (diff)
Notes
Diffstat (limited to 'usr.bin/join')
-rw-r--r--usr.bin/join/join.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 7b1e77996a7f..e3d42cf8f592 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -36,13 +36,17 @@
*/
#ifndef lint
-static char copyright[] =
+static const char copyright[] =
"@(#) Copyright (c) 1991, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
+#if 0
static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
@@ -581,8 +585,9 @@ jbad: errx(1, "illegal option -- %s", ap);
void
usage()
{
- (void)fprintf(stderr, "%s%s\n",
- "usage: join [-a fileno | -v fileno ] [-e string] [-1 field] ",
- "[-2 field]\n [-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);
}