sort options and usage();

2 files changed, 24 insertions, 20 deletions

diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index 268a2650ac2..39fb5903b6c 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.8,v 1.73 2007/02/27 02:10:58 beck Exp $
+.\"	$OpenBSD: spamd.8,v 1.74 2007/02/27 14:52:31 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Theo de Raadt.  All rights reserved.
 .\"
@@ -33,10 +33,10 @@
 .Bk -words
 .Op Fl 45bdv
 .Op Fl B Ar maxblack
-.Op Fl l Ar address
 .Op Fl c Ar maxcon
 .Op Fl G Ar passtime:greyexp:whiteexp
 .Op Fl h Ar hostname
+.Op Fl l Ar address
 .Op Fl n Ar name
 .Op Fl p Ar port
 .Op Fl r Ar reply
@@ -67,14 +67,11 @@ This value may not be greater than maxcon (see below).
 The default is
 .Ar maxcon
 \- 100.
-.It Fl l Ar address
-Specify the local address to which
-.Nm
-is to
-.Xr bind 2 .
-By default
-.Nm
-listens on all local addresses.
+.It Fl b
+Turn off Greylisting mode, and run only as a blacklister.
+See
+.Sx GREYLISTING
+below.
 .It Fl c Ar maxcon
 The maximum number of concurrent connections to allow.
 .Ar maxcon
@@ -96,12 +93,16 @@ to 4 (hours),
 and
 .Ar whiteexp
 to 864 (hours, approximately 36 days).
-.It Fl b
-Turn off Greylisting mode, and run only as a blacklister. see
-.Sx GREYLISTING
-below.
 .It Fl h Ar hostname
 The hostname that is reported in the SMTP banner.
+.It Fl l Ar address
+Specify the local address to which
+.Nm
+is to
+.Xr bind 2 .
+By default
+.Nm
+listens on all local addresses.
 .It Fl n Ar name
 The SMTP version banner that is reported upon initial connection.
 .It Fl p Ar port
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index ebd0a8fa697..f00a0610473 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd.c,v 1.89 2007/02/27 02:10:58 beck Exp $	*/
+/*	$OpenBSD: spamd.c,v 1.90 2007/02/27 14:52:31 jmc Exp $	*/
 
 /*
  * Copyright (c) 2002 Theo de Raadt.  All rights reserved.
@@ -141,12 +141,15 @@ int window;
 void
 usage(void)
 {
+	extern char *__progname;
+
 	fprintf(stderr,
-	    "usage: spamd [-45dbv] [-B maxblack] [-l address] [-c maxcon]\n");
-	fprintf(stderr,
-	    "             [-G mins:hours:hours] [-h host] [-n name] [-p port]\n");
-	fprintf(stderr,
-	    "             [-r reply] [-S secs] [-s secs] [-w window]\n");
+	    "usage: %s [-45bdv] [-B maxblack] [-c maxcon] "
+	    "[-G passtime:greyexp:whiteexp]\n"
+	    "\t[-h hostname] [-l address] [-n name] [-p port] "
+	    "[-r reply] [-S secs]\n"
+	    "\t[-s secs] [-w window]\n", __progname);
+
 	exit(1);
 }