Move ioctl syscall parser to ioctl.c

[strace] / ioctl.c

diff --git a/ioctl.c b/ioctl.c
index c67d048be760578118e7501e71f660624511e986..fef4c9adec3dd816715c9ab1fe2f65eb88bfeb1c 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -47,7 +47,7 @@ compare(const void *a, const void *b)
        return (code1 > code2) ? 1 : (code1 < code2) ? -1 : 0;
 }
 
-const struct_ioctlent *
+static const struct_ioctlent *
 ioctl_lookup(const unsigned int code)
 {
        struct_ioctlent *iop;
@@ -64,7 +64,7 @@ ioctl_lookup(const unsigned int code)
        return iop;
 }
 
-const struct_ioctlent *
+static const struct_ioctlent *
 ioctl_next_match(const struct_ioctlent *iop)
 {
        const unsigned int code = iop->code;
@@ -74,7 +74,7 @@ ioctl_next_match(const struct_ioctlent *iop)
        return NULL;
 }
 
-void
+static void
 ioctl_print_code(const unsigned int code)
 {
        tprints("_IOC(");
@@ -181,7 +181,7 @@ hiddev_decode_number(unsigned int arg)
        return 0;
 }
 
-int
+static int
 ioctl_decode_command_number(unsigned int arg)
 {
        switch (_IOC_TYPE(arg)) {
@@ -221,7 +221,7 @@ ioctl_decode_command_number(unsigned int arg)
        }
 }
 
-int
+static int
 ioctl_decode(struct tcb *tcp, unsigned int code, long arg)
 {
        switch (_IOC_TYPE(code)) {
@@ -264,51 +264,31 @@ ioctl_decode(struct tcb *tcp, unsigned int code, long arg)
        return 0;
 }
 
-/*
- * Registry of ioctl characters, culled from
- *     @(#)ioccom.h 1.7 89/06/16 SMI; from UCB ioctl.h 7.1 6/4/86
- *
- * char        file where defined              notes
- * ----        ------------------              -----
- *   F sun/fbio.h
- *   G sun/gpio.h
- *   H vaxif/if_hy.h
- *   M sundev/mcpcmd.h                 *overlap*
- *   M sys/modem.h                     *overlap*
- *   S sys/stropts.h
- *   T sys/termio.h                    -no overlap-
- *   T sys/termios.h                   -no overlap-
- *   V sundev/mdreg.h
- *   a vaxuba/adreg.h
- *   d sun/dkio.h                      -no overlap with sys/des.h-
- *   d sys/des.h                       (possible overlap)
- *   d vax/dkio.h                      (possible overlap)
- *   d vaxuba/rxreg.h                  (possible overlap)
- *   f sys/filio.h
- *   g sunwindow/win_ioctl.h           -no overlap-
- *   g sunwindowdev/winioctl.c         !no manifest constant! -no overlap-
- *   h sundev/hrc_common.h
- *   i sys/sockio.h                    *overlap*
- *   i vaxuba/ikreg.h                  *overlap*
- *   k sundev/kbio.h
- *   m sundev/msio.h                   (possible overlap)
- *   m sundev/msreg.h                  (possible overlap)
- *   m sys/mtio.h                      (possible overlap)
- *   n sun/ndio.h
- *   p net/nit_buf.h                   (possible overlap)
- *   p net/nit_if.h                    (possible overlap)
- *   p net/nit_pf.h                    (possible overlap)
- *   p sundev/fpareg.h                 (possible overlap)
- *   p sys/sockio.h                    (possible overlap)
- *   p vaxuba/psreg.h                  (possible overlap)
- *   q sun/sqz.h
- *   r sys/sockio.h
- *   s sys/sockio.h
- *   t sys/ttold.h                     (possible overlap)
- *   t sys/ttycom.h                    (possible overlap)
- *   v sundev/vuid_event.h             *overlap*
- *   v sys/vcmd.h                      *overlap*
- *   V linux/videodev2.h
- *
- * End of Registry
- */
+SYS_FUNC(ioctl)
+{
+       const struct_ioctlent *iop;
+
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               if (!ioctl_decode_command_number(tcp->u_arg[1])) {
+                       iop = ioctl_lookup(tcp->u_arg[1]);
+                       if (iop) {
+                               tprints(iop->symbol);
+                               while ((iop = ioctl_next_match(iop)))
+                                       tprintf(" or %s", iop->symbol);
+                       } else {
+                               ioctl_print_code(tcp->u_arg[1]);
+                       }
+               }
+               ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       }
+       else {
+               int ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+               if (!ret)
+                       tprintf(", %#lx", tcp->u_arg[2]);
+               else
+                       return ret - 1;
+       }
+       return 0;
+}