summaryrefslogtreecommitdiff
path: root/usr.bin/sort
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2001-02-07 20:58:09 +0000
committerjdolecek <jdolecek@NetBSD.org>2001-02-07 20:58:09 +0000
commitf6b0d130dbd07426aa1744eaf3ebbee2b485a136 (patch)
tree05943a40040a518b5e212cc2f75cee45adb58fb9 /usr.bin/sort
parenteb6e724e723797e52cd29f00683e6a1261359db5 (diff)
use -R instead of -w, since that's what OpenBSD is using and there is no reason
to be different
Diffstat (limited to 'usr.bin/sort')
-rw-r--r--usr.bin/sort/sort.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 007cc19cc59..32fd64d84d8 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.20 2001/02/07 20:31:44 jdolecek Exp $ */
+/* $NetBSD: sort.c,v 1.21 2001/02/07 20:58:09 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: sort.c,v 1.20 2001/02/07 20:31:44 jdolecek Exp $");
+__RCSID("$NetBSD: sort.c,v 1.21 2001/02/07 20:58:09 jdolecek Exp $");
__SCCSID("@(#)sort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -112,7 +112,7 @@ main(argc, argv)
fixit(&argc, argv);
- while ((ch = getopt(argc, argv, "bcdfik:mHno:rsSt:T:uw:x")) != -1) {
+ while ((ch = getopt(argc, argv, "bcdfik:mHno:rR:sSt:T:ux")) != -1) {
switch (ch) {
case 'b':
fldtab->flags |= BI | BT;
@@ -159,10 +159,7 @@ main(argc, argv)
if (d_mask[(u_char)*optarg] & REC_D_F)
errx(2, "record/field delimiter clash");
break;
- case 'T':
- /* -T tmpdir, noop (not supported) */
- break;
- case 'w':
+ case 'R':
if (REC_D != '\n')
usage("multiple record delimiters");
if ('\n' == (REC_D = *optarg))
@@ -170,6 +167,9 @@ main(argc, argv)
d_mask['\n'] = d_mask[' '];
d_mask[REC_D] = REC_D_F;
break;
+ case 'T':
+ /* -T tmpdir, noop (not supported) */
+ break;
case 'u':
UNIQUE = 1;
break;
@@ -300,6 +300,6 @@ usage(msg)
if (msg != NULL)
(void)fprintf(stderr, "sort: %s\n", msg);
(void)fprintf(stderr, "usage: [-o output] [-cmubdfinrsS] [-t char] ");
- (void)fprintf(stderr, "[-w char] [-k keydef] ... [files]\n");
+ (void)fprintf(stderr, "[-R char] [-k keydef] ... [files]\n");
exit(2);
}