[src/trunk]: src/usr.bin/pwhash Merge single-letter options; sync order in ma...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/59095500054c
branches:  trunk
changeset: 571321:59095500054c
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Nov 17 14:57:48 2004 +0000

description:
Merge single-letter options; sync order in man page and usage.

diffstat:

 usr.bin/pwhash/pwhash.1 |  7 +++----
 usr.bin/pwhash/pwhash.c |  6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 6bf886164656 -r 59095500054c usr.bin/pwhash/pwhash.1
--- a/usr.bin/pwhash/pwhash.1   Wed Nov 17 14:54:47 2004 +0000
+++ b/usr.bin/pwhash/pwhash.1   Wed Nov 17 14:57:48 2004 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pwhash.1,v 1.4 2004/10/13 23:46:42 snj Exp $
+.\"    $NetBSD: pwhash.1,v 1.5 2004/11/17 14:57:48 wiz Exp $
 .\"    $OpenBSD: encrypt.1,v 1.16 2000/11/09 17:52:07 aaron Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -32,12 +32,11 @@
 .Nd hashes passwords from the command line or standard input
 .Sh SYNOPSIS
 .Nm pwhash
+.Op Fl km
 .Op Fl b Ar rounds
-.Op Fl k
-.Op Fl m
-.Op Fl p | Ar string
 .Op Fl S Ar rounds
 .Op Fl s Ar salt
+.Op Fl p | Ar string
 .Sh DESCRIPTION
 .Nm
 prints the encrypted form of
diff -r 6bf886164656 -r 59095500054c usr.bin/pwhash/pwhash.c
--- a/usr.bin/pwhash/pwhash.c   Wed Nov 17 14:54:47 2004 +0000
+++ b/usr.bin/pwhash/pwhash.c   Wed Nov 17 14:57:48 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pwhash.c,v 1.8 2004/11/01 21:12:59 dsl Exp $   */
+/*     $NetBSD: pwhash.c,v 1.9 2004/11/17 14:57:48 wiz Exp $   */
 /*     $OpenBSD: encrypt.c,v 1.16 2002/02/16 21:27:45 millert Exp $    */
 
 /*
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: pwhash.c,v 1.8 2004/11/01 21:12:59 dsl Exp $");
+__RCSID("$NetBSD: pwhash.c,v 1.9 2004/11/17 14:57:48 wiz Exp $");
 #endif
 
 #include <sys/types.h>
@@ -60,7 +60,7 @@
 {
 
        (void)fprintf(stderr,
-           "usage: %s [-b rounds] [-k] [-m] [-S rounds] [-s salt] [-p | string]\n",
+           "usage: %s [-km] [-b rounds] [-S rounds] [-s salt] [-p | string]\n",
            getprogname());
        exit(1);
 }