diff options
| -rw-r--r-- | usr.bin/kdump/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 5 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.h | 17 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 3 |
4 files changed, 24 insertions, 5 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 5c17ab3ccb2..d5ee41191c5 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2003/06/23 16:53:06 mickey Exp $ +# $OpenBSD: Makefile,v 1.8 2003/07/02 20:54:17 deraadt Exp $ LDSTATIC=${STATIC} PROG= kdump -CFLAGS+=-I${.CURDIR}/../ktrace +CFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR} SRCS= kdump.c ioctl.c subr.c .PATH: ${.CURDIR}/../ktrace CLEANFILES+=ioctl.c diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index aeba2c8dc7e..3b21ce285f0 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdump.c,v 1.21 2003/06/03 02:56:09 millert Exp $ */ +/* $OpenBSD: kdump.c,v 1.22 2003/07/02 20:54:17 deraadt Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95"; #endif -static char *rcsid = "$OpenBSD: kdump.c,v 1.21 2003/06/03 02:56:09 millert Exp $"; +static char *rcsid = "$OpenBSD: kdump.c,v 1.22 2003/07/02 20:54:17 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -61,6 +61,7 @@ static char *rcsid = "$OpenBSD: kdump.c,v 1.21 2003/06/03 02:56:09 millert Exp $ #include <vis.h> #include "ktrace.h" +#include "kdump.h" #include "extern.h" int timestamp, decimal, fancy = 1, tail, maxdata; diff --git a/usr.bin/kdump/kdump.h b/usr.bin/kdump/kdump.h new file mode 100644 index 00000000000..c1d588ad8ad --- /dev/null +++ b/usr.bin/kdump/kdump.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2003 Theo de Raadt <deraadt@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +const char *ioctlname(unsigned long); diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 065f068c829..cc801364926 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: mkioctls,v 1.13 2003/06/26 21:44:26 deraadt Exp $ +# $OpenBSD: mkioctls,v 1.14 2003/07/02 20:54:17 deraadt Exp $ # # Copyright (c) 1994 @@ -82,6 +82,7 @@ BEGIN { print "#include <scsi/ses.h>" print "#define COMPAT_43" print "#include <sys/ioctl.h>" + print "#include \"kdump.h\"" print "" print "const char *" print "ioctlname(unsigned long val)" |