Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/sort use -R instead of -w, since that's what OpenBSD...
details: https://anonhg.NetBSD.org/src/rev/1630d22d02c5
branches: trunk
changeset: 503525:1630d22d02c5
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Wed Feb 07 20:58:09 2001 +0000
description:
use -R instead of -w, since that's what OpenBSD is using and there is no reason
to be different
diffstat:
usr.bin/sort/sort.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (57 lines):
diff -r 89e97144301b -r 1630d22d02c5 usr.bin/sort/sort.c
--- a/usr.bin/sort/sort.c Wed Feb 07 20:32:57 2001 +0000
+++ b/usr.bin/sort/sort.c Wed Feb 07 20:58:09 2001 +0000
@@ -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 @@
#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 @@
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 @@
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 @@
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 @@
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);
}
Home |
Main Index |
Thread Index |
Old Index