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

This commit is contained in:
wiz 2004-11-17 14:57:48 +00:00
parent 98b8f0e005
commit 9f522a4dd3
2 changed files with 6 additions and 7 deletions

View File

@ -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

View File

@ -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 @@ usage(void)
{
(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);
}