diff options
| author |   jmc <jmc@openbsd.org> | 2015-03-19 13:11:05 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2015-03-19 13:11:05 +0000 |
| commit | f2b9e9decca5f997e6f8e9037b4339417582b30e (patch) | |
| tree | 7949877e5fd52c2767b18d4f7b4e2e39166ede2f | |
| parent | better wording, from andre smagin; ok stsp (diff) | |
| download | wireguard-openbsd-f2b9e9decca5f997e6f8e9037b4339417582b30e.tar.xz wireguard-openbsd-f2b9e9decca5f997e6f8e9037b4339417582b30e.zip | |
update the note in STANDARDS about which options are extensions; also add -m
to SYNOPSIS and usage(), which i missed in previous;
| -rw-r--r-- | usr.bin/sort/sort.1 | 6 | ||||
| -rw-r--r-- | usr.bin/sort/sort.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1 index 9130d971e32..722363db43c 100644 --- a/usr.bin/sort/sort.1 +++ b/usr.bin/sort/sort.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sort.1,v 1.42 2015/03/19 11:38:12 jmc Exp $ +.\" $OpenBSD: sort.1,v 1.43 2015/03/19 13:11:05 jmc Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -40,7 +40,7 @@ .Nd sort, merge, or sequence check text and binary files .Sh SYNOPSIS .Nm sort -.Op Fl bCcdfgHhiMnRrsuVz +.Op Fl bCcdfgHhiMmnRrsuVz .Op Fl k Ar field1 Ns Op , Ns Ar field2 .Op Fl o Ar output .Op Fl S Ar size @@ -579,7 +579,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl ghRMSsTVz +.Op Fl gHhiMRSsTVz are extensions to that specification. .Pp All long options are extensions to the specification. diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 594e4a19116..cff82e4d139 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sort.c,v 1.45 2015/03/19 11:38:12 jmc Exp $ */ +/* $OpenBSD: sort.c,v 1.46 2015/03/19 13:11:05 jmc Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -156,7 +156,7 @@ usage(int exit_val) { fprintf(exit_val ? stderr : stdout, - "usage: %s [-bCcdfgHhiMnRrsuVz] [-k field1[,field2]] [-o output] " + "usage: %s [-bCcdfgHhiMmnRrsuVz] [-k field1[,field2]] [-o output] " "[-S size]\n\t[-T dir] [-t char] [file ...]\n", getprogname()); exit(exit_val); } |