diff options
| -rw-r--r-- | sbin/kldload/kldload.8 | 14 | ||||
| -rw-r--r-- | sbin/kldload/kldload.c | 15 | ||||
| -rw-r--r-- | sbin/kldstat/kldstat.8 | 12 | ||||
| -rw-r--r-- | sbin/kldstat/kldstat.c | 29 | ||||
| -rw-r--r-- | sbin/kldunload/kldunload.8 | 16 | ||||
| -rw-r--r-- | sbin/kldunload/kldunload.c | 25 |
6 files changed, 57 insertions, 54 deletions
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8 index a27ace2..0288aa9 100644 --- a/sbin/kldload/kldload.8 +++ b/sbin/kldload/kldload.8 @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: kldload.8,v 1.1 1997/05/07 18:19:21 dfr Exp $ .\" .Dd April 25, 1997 .Dt KLDLOAD 8 -.Os +.Os FreeBSD .Sh NAME .Nm kldload .Nd load a file into the kernel @@ -41,14 +41,20 @@ The loads a file into the kernel using the kernel linker. .Pp The options are: -.Bl -tag -width indent +.Bl -tag -width XXX -offset indent .It Fl v Be more verbose. .El .Sh SEE ALSO .Xr kldstat 8 , .Xr kldunload 8 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 3.0 . .Sh AUTHOR .Bl -tag -Doug Rabson, dfr@freebsd.org +Doug Rabson +.Aq dfr@freebsd.org .El. diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index 3145fde..5488e3e 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kldload.c,v 1.1 1997/05/07 18:19:21 dfr Exp $ + * $Id: kldload.c,v 1.2 1997/10/19 11:15:42 jmg Exp $ */ #include <err.h> @@ -33,23 +33,20 @@ #include <sys/param.h> #include <sys/linker.h> -extern int optind; - -static char* progname; - -static void usage() +static void +usage(void) { - fprintf(stderr, "usage: %s filename\n", progname); + fprintf(stderr, "usage: kldload filename\n"); exit(1); } -int main(int argc, char** argv) +int +main(int argc, char** argv) { int c; int verbose = 0; int fileid; - progname = argv[0]; while ((c = getopt(argc, argv, "v")) != -1) switch (c) { case 'v': diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8 index bafdb220..2dbf2a4 100644 --- a/sbin/kldstat/kldstat.8 +++ b/sbin/kldstat/kldstat.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: kldstat.8,v 1.1 1997/05/07 18:19:54 dfr Exp $ .\" .Dd April 25, 1997 .Dt KLDSTAT 8 @@ -43,7 +43,7 @@ utility displays the status of any files dynamically linked into the kernel. .Pp The options are: -.Bl -tag -width indent +.Bl -tag -width XXXXXXX -offset indent .It Fl v Be more verbose. .It Fl i Ar id @@ -54,7 +54,13 @@ Display the status of only the file with this name. .Sh SEE ALSO .Xr kldload 8 , .Xr kldunload 8 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 3.0 . .Sh AUTHOR .Bl -tag -Doug Rabson, dfr@freebsd.org +Doug Rabson +.Aq dfr@freebsd.org .El. diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index 9b6b2dd..b07fc62 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kldstat.c,v 1.1 1997/05/07 18:19:54 dfr Exp $ + * $Id: kldstat.c,v 1.2 1997/10/19 11:15:44 jmg Exp $ */ #include <err.h> @@ -35,12 +35,8 @@ #include <sys/module.h> #include <sys/linker.h> -extern char *optarg; -extern int optind; - -static char* progname; - -static void printmod(int modid) +static void +printmod(int modid) { struct module_stat stat; @@ -73,31 +69,31 @@ static void printfile(int fileid, int verbose) } static void -usage() +usage(void) { - fprintf(stderr, "usage: %s [-v]\n", progname); + fprintf(stderr, "usage: kldstat [-v]\n"); exit(1); } -int main(int argc, char** argv) +int +main(int argc, char** argv) { int c; int verbose = 0; int fileid = 0; char* filename = 0; - progname = argv[0]; - while ((c = getopt(argc, argv, "vi:n:")) != -1) + while ((c = getopt(argc, argv, "i:n:v")) != -1) switch (c) { - case 'v': - verbose = 1; - break; case 'i': fileid = atoi(optarg); break; case 'n': filename = optarg; break; + case 'v': + verbose = 1; + break; default: usage(); } @@ -108,8 +104,7 @@ int main(int argc, char** argv) usage(); if (filename) { - fileid = kldfind(filename); - if (fileid < 0) + if ((fileid = kldfind(filename)) < 0) err(1, "Can't find file %s", filename); } diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8 index f9b806c..2273c59 100644 --- a/sbin/kldunload/kldunload.8 +++ b/sbin/kldunload/kldunload.8 @@ -23,11 +23,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: kldunload.8,v 1.1 1997/05/07 18:19:54 dfr Exp $ .\" .Dd April 25, 1997 .Dt KLDUNLOAD 8 -.Os +.Os FreeBSD .Sh NAME .Nm kldunload .Nd unload a file from the kernel @@ -43,7 +43,7 @@ utility unloads a file which was previously loaded with .Xr kldload 8 . .Pp The options are: -.Bl -tag -width indent +.Bl -tag -width XXXXXXX -offset indent .It Fl v Be more verbose. .It Fl i Ar id @@ -54,7 +54,11 @@ Unload the file with this name. .Sh SEE ALSO .Xr kldload 8 , .Xr kldstat 8 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 3.0 . .Sh AUTHOR -.Bl -tag -Doug Rabson, dfr@freebsd.org -.El. +Doug Rabson +.Aq dfr@freebsd.org diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index fec453e..1badfed 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kldunload.c,v 1.1 1997/05/07 18:19:54 dfr Exp $ + * $Id: kldunload.c,v 1.2 1997/10/19 11:15:45 jmg Exp $ */ #include <err.h> @@ -33,36 +33,32 @@ #include <sys/param.h> #include <sys/linker.h> -extern char *optarg; -extern int optind; - -static char* progname; - -static void usage() +static void +usage(void) { fprintf(stderr, "usage: modunload [-i id] [-n filename]\n"); exit(1); } -int main(int argc, char** argv) +int +main(int argc, char** argv) { int c; int verbose = 0; int fileid = 0; char* filename = 0; - progname = argv[0]; - while ((c = getopt(argc, argv, "vi:n:")) != -1) + while ((c = getopt(argc, argv, "i:n:v")) != -1) switch (c) { - case 'v': - verbose = 1; - break; case 'i': fileid = atoi(optarg); break; case 'n': filename = optarg; break; + case 'v': + verbose = 1; + break; default: usage(); } @@ -76,8 +72,7 @@ int main(int argc, char** argv) usage(); if (filename) { - fileid = kldfind(filename); - if (fileid < 0) + if ((fileid = kldfind(filename)) < 0) err(1, "Can't find file %s", filename); } |
