summaryrefslogtreecommitdiffstats
path: root/usr.bin/truss
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-12-22 20:33:49 +0000
committerjhb <jhb@FreeBSD.org>2015-12-22 20:33:49 +0000
commitb665ac07581ab1fbd0d71db29a027b4a39734789 (patch)
tree12efcb04d4bc19b74d2554032b084f8fee602ddf /usr.bin/truss
parent2a6353954347e51fe7f57c094b3d03b9199fae99 (diff)
downloadFreeBSD-src-b665ac07581ab1fbd0d71db29a027b4a39734789.zip
FreeBSD-src-b665ac07581ab1fbd0d71db29a027b4a39734789.tar.gz
Move the mkioctls script to libsysdecode and use it to generate a
sysdecode_ioctlname() function. This function matches the behavior of the truss variant in that it returns a pointer to a string description for known ioctls. The caller is responsible for displaying unknown ioctl requests. For kdump this meant moving the logic to handle unknown ioctl requests out of the generated function and into an ioctlname() function in kdump.c instead. Differential Revision: https://reviews.freebsd.org/D4610
Diffstat (limited to 'usr.bin/truss')
-rw-r--r--usr.bin/truss/Makefile7
-rw-r--r--usr.bin/truss/syscalls.c2
2 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index a300da1..a6e4524 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -2,16 +2,11 @@
NO_WERROR=
PROG= truss
-SRCS= cloudabi.c ioctl.c main.c setup.c syscalls.c
+SRCS= cloudabi.c main.c setup.c syscalls.c
LIBADD= sysdecode
CFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../../sys
-CLEANFILES= ioctl.c
-
-ioctl.c: ${.CURDIR}/../kdump/mkioctls
- env MACHINE=${MACHINE} CPP="${CPP}" \
- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
# Define where to generate syscalls for each ABI.
ABI_SYSPATH.freebsd= sys/kern
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 990403e6..8ff57db 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1315,7 +1315,7 @@ print_arg(struct syscall_args *sc, unsigned long *args, long *retval,
unsigned long cmd;
cmd = args[sc->offset];
- temp = ioctlname(cmd);
+ temp = sysdecode_ioctlname(cmd);
if (temp)
fputs(temp, fp);
else {
OpenPOWER on IntegriCloud