Module Name: src
Committed By: wiz
Date: Fri Jun 5 09:31:07 UTC 2009
Modified Files:
src/sbin/modload: main.c modload.8
Log Message:
Sort options.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/modload/main.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/modload/modload.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/modload/main.c
diff -u src/sbin/modload/main.c:1.8 src/sbin/modload/main.c:1.9
--- src/sbin/modload/main.c:1.8 Thu Jun 4 02:57:01 2009
+++ src/sbin/modload/main.c Fri Jun 5 09:31:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2009/06/04 02:57:01 jnemeth Exp $ */
+/* $NetBSD: main.c,v 1.9 2009/06/05 09:31:07 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.8 2009/06/04 02:57:01 jnemeth Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2009/06/05 09:31:07 wiz Exp $");
#endif /* !lint */
#include <sys/module.h>
@@ -224,7 +224,7 @@
(void)fprintf(stderr,
"Usage: %s [-f] [-b var=boolean] [-i var=integer] "
"[-s var=string] module\n"
- " %s -p [-m plist] [-b var=boolean] [-i var=integer] "
+ " %s -p [-b var=boolean] [-i var=integer] [-m plist] "
"[-s var=string]\n",
getprogname(), getprogname());
exit(EXIT_FAILURE);
Index: src/sbin/modload/modload.8
diff -u src/sbin/modload/modload.8:1.32 src/sbin/modload/modload.8:1.33
--- src/sbin/modload/modload.8:1.32 Thu Jun 4 02:57:01 2009
+++ src/sbin/modload/modload.8 Fri Jun 5 09:31:07 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: modload.8,v 1.32 2009/06/04 02:57:01 jnemeth Exp $
+.\" $NetBSD: modload.8,v 1.33 2009/06/05 09:31:07 wiz Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@@ -47,9 +47,9 @@
.Ar module
.Nm
.Fl p
-.Op Fl m Ar plist
.Op Fl b Ar var=boolean
.Op Fl i Ar var=integer
+.Op Fl m Ar plist
.Op Fl s Ar var=string
.Sh DESCRIPTION
The
@@ -88,7 +88,7 @@
.Ar integer .
.It Fl m Ar plist
When used in conjuction with
-.Fl p
+.Fl p ,
merge new options with an existing property list contained in
.Ar plist .
.It Fl p
